diff --git a/.drone.yml b/.drone.yml
index 46ef6f1..f6a379a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -54,16 +54,18 @@ steps:
 - name: build
   image: plugins/docker
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
+    dockerfile: Dockerfile
     dry_run: true
-    tags: latest-amd64
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/helm
+    tags: latest-amd64
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
-    no_cache: true
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
@@ -115,16 +117,18 @@ steps:
 - name: build
   image: plugins/docker
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
+    dockerfile: Dockerfile
     dry_run: true
-    tags: latest-arm-v7
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/helm
+    tags: latest-arm-v7
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
-    no_cache: true
 
 - name: notify
   image: drillster/drone-email
@@ -176,16 +180,18 @@ steps:
 - name: build
   image: plugins/docker
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
+    dockerfile: Dockerfile
     dry_run: true
-    tags: latest-arm64-v8
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/helm
+    tags: latest-arm64-v8
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
-    no_cache: true
 
 - name: notify
   image: drillster/drone-email
@@ -237,15 +243,17 @@ steps:
 - name: build
   image: plugins/docker
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
-    tags: latest-amd64
+    dockerfile: Dockerfile
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/helm
+    tags: latest-amd64
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
-    no_cache: true
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
@@ -296,15 +304,17 @@ steps:
 - name: build
   image: plugins/docker
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
-    tags: latest-arm-v7
+    dockerfile: Dockerfile
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/helm
+    tags: latest-arm-v7
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
-    no_cache: true
 
 - name: notify
   image: drillster/drone-email
@@ -355,15 +365,17 @@ steps:
 - name: build
   image: plugins/docker
   settings:
-    dockerfile: Dockerfile
     auto_tag: false
-    tags: latest-arm64-v8
+    dockerfile: Dockerfile
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/helm
+    tags: latest-arm64-v8
     username:
       from_secret: container_image_registry_user
     password:
       from_secret: container_image_registry_password
-    no_cache: true
 
 - name: notify
   image: drillster/drone-email
@@ -465,9 +477,12 @@ steps:
 - name: build
   image: plugins/docker
   settings:
-    dockerfile: Dockerfile
-    auto_tag: true
     auto_tag_suffix: amd64
+    auto_tag: true
+    dockerfile: Dockerfile
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/helm
     username:
       from_secret: container_image_registry_user
@@ -475,7 +490,6 @@ steps:
       from_secret: container_image_registry_password
     build_args:
     - HELM_VERSION=${DRONE_TAG}
-    no_cache: true
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
@@ -520,9 +534,12 @@ steps:
 - name: build
   image: plugins/docker
   settings:
-    dockerfile: Dockerfile
-    auto_tag: true
     auto_tag_suffix: arm-v7
+    auto_tag: true
+    dockerfile: Dockerfile
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/helm
     username:
       from_secret: container_image_registry_user
@@ -530,7 +547,6 @@ steps:
       from_secret: container_image_registry_password
     build_args:
     - HELM_VERSION=${DRONE_TAG}
-    no_cache: true
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
@@ -575,9 +591,12 @@ steps:
 - name: build
   image: plugins/docker
   settings:
-    dockerfile: Dockerfile
-    auto_tag: true
     auto_tag_suffix: arm64-v8
+    auto_tag: true
+    dockerfile: Dockerfile
+    force_tag: true
+    no_cache: true
+    purge: true
     repo: volkerraschek/helm
     username:
       from_secret: container_image_registry_user
@@ -585,7 +604,6 @@ steps:
       from_secret: container_image_registry_password
     build_args:
     - HELM_VERSION=${DRONE_TAG}
-    no_cache: true
   volumes:
   - name: docker_socket
     path: /var/run/docker.sock
diff --git a/Dockerfile b/Dockerfile
index 7d9a570..f07065f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,15 @@ FROM docker.io/library/alpine:3.15
 
 ARG HELM_VERSION
 
-COPY install.sh /install.sh
-RUN VERSION=${HELM_VERSION} /install.sh
+RUN apk add bash curl git openssl && \
+    curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 --output /tmp/install.sh
 
-ENTRYPOINT [ "/usr/bin/helm" ]
+RUN [[ ${HELM_VERSION} == "" ]]; bash /tmp/install.sh
+RUN [[ ${HELM_VERSION} != "" ]]; bash /tmp/install.sh --version ${HELM_VERSION}
+
+RUN rm /tmp/install.sh
+
+# Install additionally cm-push plugin
+RUN helm plugin install https://github.com/chartmuseum/helm-push.git
+
+ENTRYPOINT [ "/usr/local/bin/helm" ]
diff --git a/Makefile b/Makefile
index 82a63b8..0d6f283 100644
--- a/Makefile
+++ b/Makefile
@@ -49,4 +49,4 @@ container-image/push:
 # ==============================================================================
 # Declare the contents of the PHONY variable as phony.  We keep that information
 # in a variable so we can use it in if_changed.
-.PHONY: ${PHONY}
\ No newline at end of file
+.PHONY: ${PHONY}
diff --git a/install.sh b/install.sh
deleted file mode 100755
index 54e5067..0000000
--- a/install.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -xe
-
-BASE_URL=https://get.helm.sh
-
-if [ -z ${VERSION+x} ]; then
-  echo ${VERSION} not defined
-  exit 1
-fi
-
-case `uname -m` in
-  x86_64)
-    ARCH=amd64
-  ;;
-  armv7l)
-    ARCH=arm
-  ;;
-  aarch64)
-    ARCH=arm64
-  ;;
-  ppc64le)
-    ARCH=ppc64le
-  ;;
-  s390x)
-    ARCH=s390x
-  ;;
-  *)
-    echo "un-supported arch, exit ..."
-    exit 1
-  ;;
-esac
-
-apk add --update --no-cache wget git
-wget ${BASE_URL}/helm-${VERSION}-linux-${ARCH}.tar.gz -O - | tar -xz
-mv linux-${ARCH}/helm /usr/bin/helm
-chmod +x /usr/bin/helm
-rm -rf linux-${ARCH}
\ No newline at end of file