diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 27bb2dee..3e6ca629 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -13,7 +13,7 @@ spec:
     spec:
       serviceAccountName: gitjob
       containers:
-        - image: "{{ .Values.image }}:{{ .Values.tag }}"
+        - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           name: gitjob
           command:
             - gitjob
@@ -21,4 +21,4 @@ spec:
             - name: NAMESPACE
               valueFrom:
                 fieldRef:
-                  fieldPath: metadata.namespace
\ No newline at end of file
+                  fieldPath: metadata.namespace
diff --git a/chart/values.yaml b/chart/values.yaml
index f111048d..ecf9d151 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,2 +1,3 @@
-image: rancher/gitjob
-tag: ${VERSION}
\ No newline at end of file
+image:
+  repository: rancher/gitjob
+  tag: ${VERSION}
diff --git a/scripts/package-helm b/scripts/package-helm
index fa6cb52c..615860f5 100755
--- a/scripts/package-helm
+++ b/scripts/package-helm
@@ -14,13 +14,14 @@ cp -rf chart build/
 rm -rf build/chart/crds
 
 sed -i \
-    -e 's/${VERSION}/'${VERSION}'/' \
+    -e 's/version:.*/version: '${HELM_VERSION}'/' \
+    -e 's/appVersion:.*/appVersion: '${HELM_VERSION}'/' \
     build/chart/Chart.yaml
 
 sed -i \
-    -e 's/${VERSION}/'${VERSION}'/' \
+    -e 's/tag:.*/tag: '${HELM_TAG}'/' \
     build/chart/values.yaml
 
 mkdir build/chart/crds
 go run pkg/crdgen/main.go > ./build/chart/crds/crds.yaml
-helm package -d ./dist/artifacts ./build/chart
\ No newline at end of file
+helm package -d ./dist/artifacts ./build/chart
diff --git a/scripts/version b/scripts/version
index 1646092e..58e799d7 100755
--- a/scripts/version
+++ b/scripts/version
@@ -19,9 +19,13 @@ fi
 
 SUFFIX="-${ARCH}"
 
+HELM_TAG=${TAG:-${VERSION}}
+HELM_VERSION=${HELM_TAG/v/}
 TAG=${TAG:-${VERSION}${SUFFIX}}
 REPO=${REPO:-rancher}
 
 if echo $TAG | grep -q dirty; then
     TAG=dev
+    HELM_TAG=dev
+    HELM_VERSION=v0.0.0
 fi