diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 730d6def15d9bb7bbd9d90da968debfacee2b5f5..c99926c431e62ae9895c18fead4ba6503653d409 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -237,10 +237,8 @@ spec:
 {{ toYaml . | indent 8 }}
       {{- end }}
       schedulerName: default-scheduler
-      {{- if (.Values.securityContext).fsGroup }}
+      {{- with .Values.podSecurityContext }}
       securityContext:
-        fsGroup: {{ (.Values.securityContext).fsGroup }}
-      {{- else }}
-      securityContext: {}
+{{ toYaml . | indent 8 }}
       {{- end }}
       terminationGracePeriodSeconds: 30
\ No newline at end of file
diff --git a/src/test/helm/deployment_container_security_context_test.yaml b/src/test/helm/deployment_container_security_context_test.yaml
index d22aa5a026e247ec201975add71bbf041ad42383..22bb64d3db0f662fd8212d060a4c940f1ce41a74 100644
--- a/src/test/helm/deployment_container_security_context_test.yaml
+++ b/src/test/helm/deployment_container_security_context_test.yaml
@@ -76,7 +76,7 @@ tests:
           value: 1000
   - it: check fsGroup
     set:
-      securityContext.fsGroup: 1000
+      podSecurityContext.fsGroup: 1000
     asserts:
       - equal:
           path: spec.template.spec.securityContext.fsGroup