diff --git a/microservicesruntime/helm/templates/job.yaml b/microservicesruntime/helm/templates/job.yaml
index e0a06c1..6c7d660 100644
--- a/microservicesruntime/helm/templates/job.yaml
+++ b/microservicesruntime/helm/templates/job.yaml
@@ -112,7 +112,7 @@ spec:
           {{- end }}
           {{- range $imagePullSecrets }}
           imagePullSecrets:
-            - name: {{ . }}
+{{- toYaml . | nindent 12 }}
           {{- end }}
   schedule: {{ $job.schedule | quote }}
   successfulJobsHistoryLimit: {{ $job.successfulJobsHistoryLimit }}
@@ -193,7 +193,7 @@ spec:
       {{- end }}
       {{- range $imagePullSecrets }}
       imagePullSecrets:
-        - name: {{ . }}
+{{- toYaml . | nindent 8 }}
       {{- end }}
  
   {{ end }}
diff --git a/microservicesruntime/helm/templates/nginx-deployment.yaml b/microservicesruntime/helm/templates/nginx-deployment.yaml
index c537285..a7f4f47 100644
--- a/microservicesruntime/helm/templates/nginx-deployment.yaml
+++ b/microservicesruntime/helm/templates/nginx-deployment.yaml
@@ -61,7 +61,7 @@ spec:
             readOnly:  false
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-      - name: {{ . }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
             
       volumes:
diff --git a/mywebmethodsserver/helm/templates/statefulset.yaml b/mywebmethodsserver/helm/templates/statefulset.yaml
index e36c3b9..3e0a22c 100644
--- a/mywebmethodsserver/helm/templates/statefulset.yaml
+++ b/mywebmethodsserver/helm/templates/statefulset.yaml
@@ -42,7 +42,7 @@ spec:
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-      - name: {{ . }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       serviceAccountName: {{ include "common.names.serviceAccountName" . }}
       securityContext:
diff --git a/universalmessaging/helm/templates/job.yaml b/universalmessaging/helm/templates/job.yaml
index 15cff01..a693380 100644
--- a/universalmessaging/helm/templates/job.yaml
+++ b/universalmessaging/helm/templates/job.yaml
@@ -115,7 +115,7 @@ spec:
           {{- end }}
           {{- range $imagePullSecrets }}
           imagePullSecrets:
-            - name: {{ . }}
+{{- toYaml . | nindent 12 }}
           {{- end }}
   schedule: {{ $job.schedule | quote }}
   successfulJobsHistoryLimit: {{ $job.successfulJobsHistoryLimit }}
@@ -196,7 +196,7 @@ spec:
       {{- end }}
       {{- range $imagePullSecrets }}
       imagePullSecrets:
-        - name: {{ . }}
+{{- toYaml . | nindent 8 }}
       {{- end }}
  
   {{ end }}
diff --git a/universalmessaging/helm/templates/statefulset.yaml b/universalmessaging/helm/templates/statefulset.yaml
index 3573029..756c2c2 100644
--- a/universalmessaging/helm/templates/statefulset.yaml
+++ b/universalmessaging/helm/templates/statefulset.yaml
@@ -40,10 +40,10 @@ spec:
       labels:
         {{- include "common.labels.matchLabels" . | nindent 8 }}
     spec:
-      {{- range .Values.imagePullSecrets }}
+      {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
-        - name: {{ . }}
-      {{- end }}    
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       serviceAccountName: {{ .Values.serviceAccountName }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}