diff --git a/.gimlet/penpot-infra.yaml b/.gimlet/penpot-infra.yaml
new file mode 100644
index 000000000..d3c71cdba
--- /dev/null
+++ b/.gimlet/penpot-infra.yaml
@@ -0,0 +1,17 @@
+app: penpot-infra
+env: prod
+namespace: penpot
+chart:
+  repository: https://chart.onechart.dev
+  name: onechart
+  version: 0.64.0
+values:
+  containerPort: 1025
+  gitRepository: tokens-studio/tokens-studio-for-penpot
+  gitSha: '{{ .SHA }}'
+  image:
+    repository: oryd/mailslurper
+    tag: smtps-latest
+  replicas: 1
+  resources:
+    ignoreLimits: true
\ No newline at end of file
diff --git a/.gimlet/penpot-pr.yaml b/.gimlet/penpot-pr.yaml
index f8cdaaf58..8a1c21aae 100644
--- a/.gimlet/penpot-pr.yaml
+++ b/.gimlet/penpot-pr.yaml
@@ -1,6 +1,7 @@
 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 15fedd578..a7ef1d76f 100644
--- a/.gimlet/penpot-prod.yaml
+++ b/.gimlet/penpot-prod.yaml
@@ -1,6 +1,6 @@
 app: penpot
 env: prod
-namespace: apps
+namespace: penpot
 deploy:
   branch: token-studio-develop
   event: push
@@ -102,6 +102,11 @@ manifests: |
         redisEnabled: true
         imagePullSecrets: 
           - name: ghcr-login-secret
+      smtp:
+        enabled: true
+        host: mailslurper
+        tls: false
+        port: 1025
       persistence:
         enabled: true
         storageClass: standard-rwx