diff --git a/charts/airbyte-bootloader/templates/pod.yaml b/charts/airbyte-bootloader/templates/pod.yaml
index aefd147e0e3f..17cd565e8d14 100644
--- a/charts/airbyte-bootloader/templates/pod.yaml
+++ b/charts/airbyte-bootloader/templates/pod.yaml
@@ -20,9 +20,7 @@ spec:
   serviceAccountName: {{ .Values.global.serviceAccountName }}
   {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets:
-        {{- range .Values.global.imagePullSecrets }}
           {{- printf "- name: %s" . | nindent 2 }}
-        {{- end }}
   {{- end }}
   restartPolicy: Never
   {{- if .Values.nodeSelector }}
@@ -95,5 +93,4 @@ spec:
         {{- toYaml .Values.extraEnv | nindent 8 }}
         {{- end }}
 
-
       resources: {{- toYaml .Values.resources | nindent 8 }}
diff --git a/charts/airbyte-bootloader/values.yaml b/charts/airbyte-bootloader/values.yaml
index 7c49f73c7037..98a25f5456bc 100644
--- a/charts/airbyte-bootloader/values.yaml
+++ b/charts/airbyte-bootloader/values.yaml
@@ -67,4 +67,3 @@ extraEnv: []
 secrets: {}
 env_vars: {}
 
-
diff --git a/charts/airbyte-server/templates/deployment.yaml b/charts/airbyte-server/templates/deployment.yaml
index c91cdf0bd0bd..b8f0e343a26b 100644
--- a/charts/airbyte-server/templates/deployment.yaml
+++ b/charts/airbyte-server/templates/deployment.yaml
@@ -29,9 +29,7 @@ spec:
       serviceAccountName: {{ .Values.global.serviceAccountName }}
       {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets:
-        {{- range .Values.global.imagePullSecrets }}
           {{- printf "- name: %s" . | nindent 2 }}
-        {{- end }}
       {{- end }}
       {{- if .Values.nodeSelector }}
       nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}
@@ -257,6 +255,7 @@ spec:
       {{- if .Values.global.extraContainers }}
       {{ toYaml .Values.global.extraContainers | indent 8 }}
       {{- end }}
+
       volumes:
       {{- if eq .Values.deploymentMode "oss" }}
       - name: gcs-log-creds-volume
diff --git a/charts/airbyte-server/values.yaml b/charts/airbyte-server/values.yaml
index e16b59c3efa5..45bfccd0b132 100644
--- a/charts/airbyte-server/values.yaml
+++ b/charts/airbyte-server/values.yaml
@@ -188,4 +188,6 @@ extraContainers: []
 extraInitContainers: []
 
 secrets: {}
-env_vars: {}
\ No newline at end of file
+
+env_vars: {}
+
diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml
index 6e73338c9481..b3d745f36e57 100644
--- a/charts/airbyte-webapp/templates/deployment.yaml
+++ b/charts/airbyte-webapp/templates/deployment.yaml
@@ -35,9 +35,7 @@ spec:
       {{- end }}
       {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets:
-        {{- range .Values.global.imagePullSecrets }}
           {{- printf "- name: %s" . | nindent 2 }}
-        {{- end }}
       {{- end }}
       containers:
       - name: airbyte-webapp-container
diff --git a/charts/airbyte-webapp/values.yaml b/charts/airbyte-webapp/values.yaml
index 91154ad4d0e2..418ce8bbc6a0 100644
--- a/charts/airbyte-webapp/values.yaml
+++ b/charts/airbyte-webapp/values.yaml
@@ -176,4 +176,6 @@ extraContainers: []
 
 secrets: {}
 
-env_vars: []
\ No newline at end of file
+
+env_vars: {}
+
diff --git a/charts/airbyte-worker/templates/deployment.yaml b/charts/airbyte-worker/templates/deployment.yaml
index 2dad41888c04..83e37e8d9600 100644
--- a/charts/airbyte-worker/templates/deployment.yaml
+++ b/charts/airbyte-worker/templates/deployment.yaml
@@ -28,9 +28,7 @@ spec:
       automountServiceAccountToken: true
       {{- if .Values.global.imagePullSecrets }}
       imagePullSecrets:
-        {{- range .Values.global.imagePullSecrets }}
           {{- printf "- name: %s" . | nindent 2 }}
-        {{- end }}
       {{- end }}
       {{- if .Values.nodeSelector }}
       nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.nodeSelector "context" $) | nindent 8 }}