diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 25aac6555744ac684adeebce207ec3591d9a5831..700bdd9fb705ff655998f12c23c3af4dfb1cde54 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -167,10 +167,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 f8679c7fd3c246ecec861d85e6cbc88eff467faf..ddaa3ee20b9b707914a69d75e00e77ab6df702ca 100644
--- a/src/test/helm/deployment_container_security_context_test.yaml
+++ b/src/test/helm/deployment_container_security_context_test.yaml
@@ -71,7 +71,7 @@ tests:
           value: 1000
   - it: check fsGroup
     set:
-      securityContext.fsGroup: 1000
+      podSecurityContext.fsGroup: 1000
     asserts:
       - equal:
           path: spec.template.spec.securityContext.fsGroup
diff --git a/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml b/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml
index 04e62c964cce2c3d83c1771b114d4d1ac94fe5e4..1523ad46d16c466f8126d74fbfff97cd2d2d2229 100644
--- a/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml
+++ b/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml
@@ -168,9 +168,7 @@ spec:
             {{ else }}
             - name: {{ .Release.Name }}-image-pull-secret
             {{- end }}
-          {{- if (.Values.securityContext).fsGroup }}
+          {{- with .Values.podSecurityContext }}
           securityContext:
-            fsGroup: {{ (.Values.securityContext).fsGroup }}
-          {{- else }}
-          securityContext: {}
-          {{- end }}
+{{ toYaml . | indent 12 }}
+          {{- end }}
\ No newline at end of file
diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml
index c42c4aadc068555e2f789fa4d449fcea8ac22d2d..b17ff7452fb6022ce9d20bdfd58b5b28b538e393 100644
--- a/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml
+++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml
@@ -133,7 +133,7 @@ tests:
           workload: xta-adapter-cronjob
   - it: check fsGroup
     set:
-      securityContext.fsGroup: 1000
+      podSecurityContext.fsGroup: 1000
     asserts:
       - equal:
           path: spec.jobTemplate.spec.template.spec.securityContext.fsGroup