diff --git a/clusters/cl01tl/applications/penpot/values.yaml b/clusters/cl01tl/applications/penpot/values.yaml
index adee054c0..ef67a42fc 100644
--- a/clusters/cl01tl/applications/penpot/values.yaml
+++ b/clusters/cl01tl/applications/penpot/values.yaml
@@ -1,4 +1,18 @@
 penpot:
+  defaultPodOptions:
+    securityContext:
+      enabled: true
+      fsGroup: 1001  
+    affinity:
+      podAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+        - labelSelector:
+            matchExpressions:
+            - key: app.kubernetes.io/instance
+              operator: In
+              values:
+              - penpot
+          topologyKey: "kubernetes.io/hostname"
   controllers:
     frontend:
       type: deployment
@@ -87,16 +101,6 @@ penpot:
           envFrom:
             - secretRef:
                 name: penpot-bucket-user-secret
-          affinity:
-            podAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-              - labelSelector:
-                  matchExpressions:
-                  - key: app.kubernetes.io/instance
-                    operator: In
-                    values:
-                    - penpot
-                topologyKey: "kubernetes.io/hostname"
           resources:
             requests:
               cpu: 100m
@@ -106,9 +110,6 @@ penpot:
       replicas: 1
       strategy: Recreate
       revisionHistoryLimit: 3
-      securityContext:
-        enabled: true
-        fsGroup: 1001
       containers:
         main:
           image:
@@ -191,16 +192,6 @@ penpot:
           envFrom:
             - secretRef:
                 name: penpot-bucket-user-secret
-          affinity:
-            podAffinity:
-              requiredDuringSchedulingIgnoredDuringExecution:
-              - labelSelector:
-                  matchExpressions:
-                  - key: app.kubernetes.io/instance
-                    operator: In
-                    values:
-                    - penpot
-                topologyKey: "kubernetes.io/hostname"
           securityContext:
             enabled: true
             runAsUser: 1001
@@ -219,9 +210,6 @@ penpot:
       replicas: 1
       strategy: Recreate
       revisionHistoryLimit: 3
-      securityContext:
-        enabled: true
-        fsGroup: 1001
       containers:
         main:
           image: