diff --git a/stable/collabora-online/3.1.1/ix_values.yaml b/stable/collabora-online/3.1.1/ix_values.yaml
index f4d3951ce32..a8c32529c91 100644
--- a/stable/collabora-online/3.1.1/ix_values.yaml
+++ b/stable/collabora-online/3.1.1/ix_values.yaml
@@ -9,7 +9,12 @@ image:
   tag: 6.4.7.5
   pullPolicy: IfNotPresent
 
-startAsRoot: true
+# Configure the Security Context for the Pod
+podSecurityContext:
+  runAsNonRoot: false
+  runAsUser: null
+  runAsGroup: null
+  fsGroup: null
 
 ##
 # Most other defaults are set in questions.yaml
diff --git a/stable/collabora-online/3.1.1/questions.yaml b/stable/collabora-online/3.1.1/questions.yaml
index 1bf74aff4da..62b83c25972 100644
--- a/stable/collabora-online/3.1.1/questions.yaml
+++ b/stable/collabora-online/3.1.1/questions.yaml
@@ -360,75 +360,3 @@ questions:
                       schema:
                         type: string
                         default: ""
-
-  - variable: UMASK
-    group: "Advanced"
-    label: "UMASK"
-    description: "Sets the UMASK env var for LinuxServer.io (compatible) containers"
-    schema:
-      type: string
-      default: "002"
-  # Enable privileged
-  - variable: securityContext
-    group: "Advanced"
-    label: "Security Context"
-    schema:
-      type: dict
-      attrs:
-        - variable: privileged
-          label: "Enable privileged mode for Common-Chart based charts"
-          schema:
-            type: boolean
-            default: false
-  # Set Pod Security Policy
-  - variable: podSecurityContext
-    group: "Advanced"
-    label: "Pod Security Context"
-    schema:
-      type: dict
-      attrs:
-        - variable: runAsNonRoot
-          label: "runAsNonRoot"
-          schema:
-            type: boolean
-            default: true
-        - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
-          schema:
-            type: int
-            default: 568
-        - variable: runAsGroup
-          label: "runAsGroup"
-          description: The groupID this App of the user running the application"
-          schema:
-            type: int
-            default: 568
-        - variable: supplementalGroups
-          label: "supplementalGroups"
-          description: "Additional groups this App needs access to"
-          schema:
-            type: list
-            default: []
-            items:
-              - variable: Group
-                label: "Group"
-                schema:
-                  type: int
-                  default: 568
-        - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
-          schema:
-            type: int
-            default: 568
-        - variable: fsGroupChangePolicy
-          label: "When should we take ownership?"
-          schema:
-            type: string
-            default: "OnRootMismatch"
-            enum:
-              - value: "OnRootMismatch"
-                description: "OnRootMismatch"
-              - value: "Always"
-                description: "Always"
diff --git a/stable/collabora-online/3.1.1/test_values.yaml b/stable/collabora-online/3.1.1/test_values.yaml
index 49de788ce8b..6366e0e03c7 100644
--- a/stable/collabora-online/3.1.1/test_values.yaml
+++ b/stable/collabora-online/3.1.1/test_values.yaml
@@ -9,9 +9,9 @@ strategy:
 # Configure the Security Context for the Pod
 podSecurityContext:
   runAsNonRoot: false
-  runAsUser: 102
-  runAsGroup: 102
-  fsGroup: 568
+  runAsUser: null
+  runAsGroup: null
+  fsGroup: null
 
 services:
   main: