diff --git a/chart/gameshelf/templates/deployment.yaml b/chart/gameshelf/templates/deployment.yaml
index e544dae..ccbd2cc 100644
--- a/chart/gameshelf/templates/deployment.yaml
+++ b/chart/gameshelf/templates/deployment.yaml
@@ -26,9 +26,9 @@ spec:
       containers:
         - name: gameshelf
           {{- if .Values.imageProxy.host }}
-          image: "{{ .Values.imageProxy.host }}/proxy/{{ .Values.imageProxy.appSlug }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.imageProxy.host }}/proxy/{{ .Values.imageProxy.appSlug }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           {{- else }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
diff --git a/helmchart.yaml b/helmchart.yaml
index 6220fd0..284c764 100644
--- a/helmchart.yaml
+++ b/helmchart.yaml
@@ -7,10 +7,11 @@ spec:
     name: gameshelf
     chartVersion: "0.0.0"
   values:
-    image:
-      tag: repl{{ .VersionLabel }}
     adminSecret: repl{{ ConfigOption `admin_secret`}}
     siteName: repl{{ ConfigOption `site_name`}}
+    global:
+      imagePullSecrets:
+        - name: repl{{ ImagePullSecretName }}
   builder:
     image:
       tag: latest