diff --git a/.gimlet/k8s/penpot/templates/backend/deployment.yaml b/.gimlet/k8s/penpot/templates/backend/deployment.yaml
index c1e9d6483..74a333ccd 100644
--- a/.gimlet/k8s/penpot/templates/backend/deployment.yaml
+++ b/.gimlet/k8s/penpot/templates/backend/deployment.yaml
@@ -27,16 +27,6 @@ spec:
         {{- omit .Values.backend.podSecurityContext "enabled" | toYaml | nindent 8 }}
     {{- end }}
       serviceAccountName: {{ include "penpot.serviceAccountName" . }}
-      affinity:
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app.kubernetes.io/instance
-                operator: In
-                values:
-                - {{ .Release.Name }}
-            topologyKey: "kubernetes.io/hostname"
       containers:
         - name: {{ .Chart.Name }}-backend
         {{ if .Values.backend.containerSecurityContext.enabled }}
diff --git a/.gimlet/penpot-infra.yaml b/.gimlet/penpot-infra.yaml
index 1d94582ad..335fcdaa7 100644
--- a/.gimlet/penpot-infra.yaml
+++ b/.gimlet/penpot-infra.yaml
@@ -27,11 +27,10 @@ manifests: |
       spec:
         containers:
         - name: mailslurper
-          image: oryd/mailslurper:smtps-latest
+          image: sj26/mailcatcher:latest
           ports:
           - containerPort: 1025
-          - containerPort: 4436
-          - containerPort: 4437
+          - containerPort: 1080
   ---
   apiVersion: v1
   kind: Service
diff --git a/.gimlet/penpot-pr.yaml b/.gimlet/penpot-pr.yaml
index 40d35c18b..c0bdc8588 100644
--- a/.gimlet/penpot-pr.yaml
+++ b/.gimlet/penpot-pr.yaml
@@ -27,9 +27,11 @@ values:
     secret: db-penpot-secrets
     superUser: db-penpot-superuser-secret
   config:
+    telemetryEnabled: false
     assets:
       storageBackend: assets-s3
       s3:
+        region: eu-west
         bucket: assets
         endpointURI: http://minio.penpot.svc.cluster.local:80
         existingSecret: 
@@ -37,18 +39,18 @@ values:
         secretKeys:
           accessKeyIDKey: CONSOLE_ACCESS_KEY
           secretAccessKey: CONSOLE_SECRET_KEY
-      
-      # - AWS_ACCESS_KEY_ID=<KEY_ID>
-      # - AWS_SECRET_ACCESS_KEY=<ACCESS_KEY>
-      # - PENPOT_ASSETS_STORAGE_BACKEND=assets-s3
-      # - PENPOT_STORAGE_ASSETS_S3_ENDPOINT=http://penpot-minio:9000
-      # - PENPOT_STORAGE_ASSETS_S3_BUCKET=<BUKET_NAME>
+    flags: 'enable-smtp'
     smtp:
       enabled: true
       host: mailslurper
+      defaultFrom: no-reply@penpot.tokens.studio
+      defaultReplyTo: no-reply@penpot.tokens.studio
+      username: test
+      password: test
       tls: false
+      ssl: false
       port: 1025
-    publicURI: https://{{ .BRANCH | sanitizeDNSName }}.penpot.dev.tokens.studio
+    publicURI: https://{{ .BRANCH | sanitizeDNSName }}.penpot.alpha.tokens.studio
     redis:
       host: penpot-redis-master.penpot.svc.cluster.local
     postgresql:
@@ -79,8 +81,8 @@ values:
       annotations:
         cert-manager.io/cluster-issuer: letsencrypt-prod
       hosts:
-        - host: "{{ .BRANCH | sanitizeDNSName }}.penpot.dev.tokens.studio"
+        - host: "{{ .BRANCH | sanitizeDNSName }}.penpot.alpha.tokens.studio"
       tls:
-        - secretName: tls-penpot
+        - secretName: tls-penpot-{{ .BRANCH | sanitizeDNSName }}
           hosts:
-          - "{{ .BRANCH | sanitizeDNSName }}.penpot.dev.tokens.studio"
+          - "{{ .BRANCH | sanitizeDNSName }}.penpot.alpha.tokens.studio"
diff --git a/.gimlet/penpot-prod.yaml b/.gimlet/penpot-prod.yaml
index b9b22ffc1..1dff095e4 100644
--- a/.gimlet/penpot-prod.yaml
+++ b/.gimlet/penpot-prod.yaml
@@ -22,9 +22,11 @@ values:
     secret: db-penpot-secrets
     superUser: db-penpot-superuser-secret
   config:
+    flags: 'enable-smtp'
     assets:
       storageBackend: assets-s3
       s3:
+        region: eu-west
         bucket: assets
         endpointURI: http://minio.penpot.svc.cluster.local:80
         existingSecret: 
@@ -35,7 +37,12 @@ values:
     smtp:
       enabled: true
       host: mailslurper
+      defaultFrom: no-reply@penpot.tokens.studio
+      defaultReplyTo: no-reply@penpot.tokens.studio
+      username: test
+      password: test
       tls: false
+      ssl: false
       port: 1025
     publicURI: https://penpot.tokens.studio
     redis: