diff --git a/.gitpod.yml b/.gitpod.yml
index 8140a7dcb4d859..47106c1bed66a0 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,4 +1,4 @@
-image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:csweichel-leeway-vet-ignore-warnings-2986.0
+image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:gpl-bump-helm.12
 workspaceLocation: gitpod/gitpod-ws.theia-workspace
 checkoutLocation: gitpod
 ports:
diff --git a/.werft/build.yaml b/.werft/build.yaml
index 794d836c117658..cf420104096be4 100644
--- a/.werft/build.yaml
+++ b/.werft/build.yaml
@@ -30,7 +30,7 @@ pod:
     - name: MYSQL_TCP_PORT
       value: 23306
   - name: build
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:csweichel-leeway-vet-ignore-warnings-2986.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:gpl-bump-helm.12
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
diff --git a/.werft/wipe-devstaging.yaml b/.werft/wipe-devstaging.yaml
index 0c3aef8cfd9953..92041ab41d06e2 100644
--- a/.werft/wipe-devstaging.yaml
+++ b/.werft/wipe-devstaging.yaml
@@ -14,7 +14,7 @@ pod:
       secretName: gcp-sa-gitpod-dev-deployer
   containers:
   - name: wipe-devstaging
-    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:csweichel-leeway-vet-ignore-warnings-2986.0
+    image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:gpl-bump-helm.12
     workingDir: /workspace
     imagePullPolicy: Always
     volumeMounts:
diff --git a/chart/BUILD.yaml b/chart/BUILD.yaml
index ded3d265a089b7..50717a2adb24f1 100644
--- a/chart/BUILD.yaml
+++ b/chart/BUILD.yaml
@@ -15,7 +15,8 @@ packages:
     config:
       commands:
         # set values
-        - ["yq", "w", "-i", "Chart.yaml", "version", "${version}"]
+        # Chart.version has to be semver compliant
+        - ["sh", "-c", "yq w -i Chart.yaml version 0.1.0-${version}"]
         - ["yq", "w", "-i", "values.yaml", "version", "${version}"]
         - ["yq", "w", "-i", "values.yaml", "imagePrefix", "${imageRepoBase}/"]
         # prepare chart
diff --git a/dev/image/Dockerfile b/dev/image/Dockerfile
index 492d228634ac2f..cab7b666c6298f 100644
--- a/dev/image/Dockerfile
+++ b/dev/image/Dockerfile
@@ -15,10 +15,11 @@ RUN curl -fsSL https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 > $CLO
 
 ### Helm3 ###
 RUN mkdir -p /tmp/helm/ \
-    && curl -fsSL https://get.helm.sh/helm-v3.0.3-linux-amd64.tar.gz | tar -xzvC /tmp/helm/ --strip-components=1 \
+    && curl -fsSL https://get.helm.sh/helm-v3.5.2-linux-amd64.tar.gz | tar -xzvC /tmp/helm/ --strip-components=1 \
     && cp /tmp/helm/helm /usr/local/bin/helm \
     && cp /tmp/helm/helm /usr/local/bin/helm3 \
-    && rm -rf /tmp/helm/
+    && rm -rf /tmp/helm/ \
+    && helm completion bash > /usr/share/bash-completion/completions/helm
 
 ### kubernetes ###
 RUN mkdir -p /usr/local/kubernetes/ && \