diff --git a/step-issuer/templates/deployment.yaml b/step-issuer/templates/deployment.yaml
index 63be54d..1677fac 100644
--- a/step-issuer/templates/deployment.yaml
+++ b/step-issuer/templates/deployment.yaml
@@ -41,8 +41,10 @@ spec:
         ports:
         - containerPort: {{ .Values.service.port }}
           name: {{ .Values.service.targetPorts }}
+        {{- with .Values.kubeRBACproxy.securityContext }}
         securityContext:
-          {{- toYaml .Values.kubeRBACproxy.securityContext | nindent 10 }}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
       - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         name: manager
@@ -56,8 +58,10 @@ spec:
           {{- end }}
         ]
         command: ["/manager"]
+        {{- with .Values.securityContext }}
         securityContext:
-          {{- toYaml .Values.securityContext | nindent 10 }}
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
         {{- if .Values.tunnel.enabled }}
         env:
           - name: STEP_TLS_TUNNEL
@@ -105,5 +109,7 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       terminationGracePeriodSeconds: {{ .Values.deployment.terminationGracePeriodSeconds }}
+      {{- with .Values.podSecurityContext }}
       securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}