diff --git a/.gimlet/penpot-infra.yaml b/.gimlet/penpot-infra.yaml
index 0140f5bec..d67805d41 100644
--- a/.gimlet/penpot-infra.yaml
+++ b/.gimlet/penpot-infra.yaml
@@ -1,7 +1,13 @@
 app: penpot-infra
 env: prod
-namespace: penpot
 manifests: |
+  apiVersion: v1
+  kind: Namespace
+  metadata:
+    name: penpot
+    labels:
+      toolkit.fluxcd.io/tenant: penpot-team
+  ---
   apiVersion: apps/v1
   kind: Deployment
   namespace: penpot
diff --git a/.gimlet/penpot-pr.yaml b/.gimlet/penpot-pr.yaml
index 8a1c21aae..f8cdaaf58 100644
--- a/.gimlet/penpot-pr.yaml
+++ b/.gimlet/penpot-pr.yaml
@@ -1,7 +1,6 @@
 app: penpot-pr-{{ .BRANCH | sanitizeDNSName }}
 # TODO move to staging cluster when ready
 env: prod
-namespace: penpot
 deploy:
   event: pr
 cleanup:
diff --git a/.gimlet/penpot-prod.yaml b/.gimlet/penpot-prod.yaml
index a7ef1d76f..1982cbea0 100644
--- a/.gimlet/penpot-prod.yaml
+++ b/.gimlet/penpot-prod.yaml
@@ -1,17 +1,9 @@
 app: penpot
 env: prod
-namespace: penpot
 deploy:
   branch: token-studio-develop
   event: push
 manifests: | 
-  apiVersion: v1
-  kind: Namespace
-  metadata:
-    name: penpot
-    labels:
-      toolkit.fluxcd.io/tenant: penpot-team
-  ---
   apiVersion: source.toolkit.fluxcd.io/v1beta2
   kind: HelmRepository
   metadata: