diff --git a/charts/clearml/templates/_helpers.tpl b/charts/clearml/templates/_helpers.tpl
index ccd4862..a7a6655 100644
--- a/charts/clearml/templates/_helpers.tpl
+++ b/charts/clearml/templates/_helpers.tpl
@@ -144,13 +144,6 @@ Create the name of the Files service to use
 {{/*
 Return the proper Docker Image Registry Secret Names
 */}}
-{{- define "clearml.imagePullSecrets" -}}
-{{- if .Values.global }}
-{{- if .Values.global.imagePullSecrets }}
-imagePullSecrets:
-{{- range .Values.global.imagePullSecrets }}
-  - name: {{ . }}
+{{- define "imagePullSecret" }}
+{{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.imageCredentials.registry (printf "%s:%s" .Values.imageCredentials.username .Values.imageCredentials.password | b64enc) | b64enc }}
 {{- end }}
-{{- end -}}
-{{- end -}}
-{{- end -}}
diff --git a/charts/clearml/templates/deployment-apiserver.yaml b/charts/clearml/templates/deployment-apiserver.yaml
index 15ac311..49323cf 100644
--- a/charts/clearml/templates/deployment-apiserver.yaml
+++ b/charts/clearml/templates/deployment-apiserver.yaml
@@ -22,7 +22,7 @@ spec:
       {{- if .Values.imageCredentials.enabled }}
       imagePullSecrets:
       {{- if .Values.imageCredentials.existingSecret }}
-      - name: .Values.imageCredentials.existingSecret
+      - name: {{ .Values.imageCredentials.existingSecret }}
       {{- else }}
       - name: clearml-agent-registry-key
       {{- end }}
diff --git a/charts/clearml/templates/deployment-fileserver.yaml b/charts/clearml/templates/deployment-fileserver.yaml
index 88c6805..b07103a 100644
--- a/charts/clearml/templates/deployment-fileserver.yaml
+++ b/charts/clearml/templates/deployment-fileserver.yaml
@@ -25,7 +25,7 @@ spec:
       {{- if .Values.imageCredentials.enabled }}
       imagePullSecrets:
       {{- if .Values.imageCredentials.existingSecret }}
-      - name: .Values.imageCredentials.existingSecret
+      - name: {{ .Values.imageCredentials.existingSecret }}
       {{- else }}
       - name: clearml-agent-registry-key
       {{- end }}
diff --git a/charts/clearml/templates/deployment-webserver.yaml b/charts/clearml/templates/deployment-webserver.yaml
index 68880bc..6f3dbf0 100644
--- a/charts/clearml/templates/deployment-webserver.yaml
+++ b/charts/clearml/templates/deployment-webserver.yaml
@@ -21,7 +21,7 @@ spec:
       {{- if .Values.imageCredentials.enabled }}
       imagePullSecrets:
       {{- if .Values.imageCredentials.existingSecret }}
-      - name: .Values.imageCredentials.existingSecret
+      - name: {{ .Values.imageCredentials.existingSecret }}
       {{- else }}
       - name: clearml-agent-registry-key
       {{- end }}
diff --git a/charts/clearml/templates/imagePullSecret.yaml b/charts/clearml/templates/imagePullSecret.yaml
new file mode 100755
index 0000000..86c4266
--- /dev/null
+++ b/charts/clearml/templates/imagePullSecret.yaml
@@ -0,0 +1,9 @@
+{{- if .Values.imageCredentials.enabled -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: clearml-agent-registry-key
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: {{ template "imagePullSecret" . }}
+{{- end }}
\ No newline at end of file