diff --git a/helm/flowforge/templates/broker.yaml b/helm/flowforge/templates/broker.yaml
index df962fc7..d15d3658 100644
--- a/helm/flowforge/templates/broker.yaml
+++ b/helm/flowforge/templates/broker.yaml
@@ -32,8 +32,10 @@ spec:
       priorityClassName: "{{ .Values.forge.priorityClassName}}"
       {{- end }}
       automountServiceAccountToken: false
+      {{- if .Values.forge.broker.podSecurityContext }}
       securityContext:
         {{- toYaml .Values.forge.broker.podSecurityContext | nindent 8 }}
+      {{- end }}
       containers:
       - name: broker
         image: {{ .Values.forge.broker.image }}
diff --git a/helm/flowforge/templates/deployment.yaml b/helm/flowforge/templates/deployment.yaml
index 5a7d8d24..6685e7fc 100644
--- a/helm/flowforge/templates/deployment.yaml
+++ b/helm/flowforge/templates/deployment.yaml
@@ -40,8 +40,10 @@ spec:
       {{- end }}
       serviceAccountName: flowforge
       automountServiceAccountToken: true 
+      {{- if .Values.forge.podSecurityContext }}
       securityContext:
         {{- toYaml .Values.forge.podSecurityContext | nindent 8 }}
+      {{- end }}
       initContainers:
       - name: config
         image: "ruby:2.7-slim"
diff --git a/helm/flowforge/templates/file-storage.yml b/helm/flowforge/templates/file-storage.yml
index eeebc87c..6d4a1b0d 100644
--- a/helm/flowforge/templates/file-storage.yml
+++ b/helm/flowforge/templates/file-storage.yml
@@ -53,8 +53,10 @@ spec:
       priorityClassName: "{{ .Values.forge.priorityClassName}}"
       {{- end }}
       automountServiceAccountToken: false
+      {{- if .Values.forge.fileStore.podSecurityContext }}
       securityContext:
         {{- toYaml .Values.forge.fileStore.podSecurityContext | nindent 8 }}
+      {{- end }}
       initContainers:
       - name: config
         image: "ruby:2.7-slim"