diff --git a/config/controller.yaml b/config/controller.yaml
index 63b31677709..1950570e5ce 100644
--- a/config/controller.yaml
+++ b/config/controller.yaml
@@ -159,9 +159,7 @@ spec:
       securityContext:
         seLinuxOptions:
           role: "RunAsUser"
-        runAsGroup: 65535
-        fsGroup: 65535
-        supplementalGroups: 65535
+        runAsNonRoot: true
 ---
 apiVersion: v1
 kind: Service
diff --git a/config/webhook.yaml b/config/webhook.yaml
index c8ffd595f09..e1c0dbb0734 100644
--- a/config/webhook.yaml
+++ b/config/webhook.yaml
@@ -143,9 +143,7 @@ spec:
       securityContext:
         seLinuxOptions:
           role: "RunAsUser"
-        runAsGroup: 65535
-        fsGroup: 65535
-        supplementalGroups: 65535
+        runAsNonRoot: true
 ---
 apiVersion: v1
 kind: Service