diff --git a/.circleci/config.yml b/.circleci/config.yml
index 564488bb..47a99c53 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: docker:19.03.5-git
+      - image: docker:19.03.13-git
     steps:
       - checkout
       - setup_remote_docker
@@ -44,14 +44,16 @@ jobs:
       - run:
           name: build docker images and push them to dockerhub
           command: |
+            helm_versions=( "v3.3.4" "v.3.3.3" "v3.3.2" "v3.3.1" "v3.3.0" "v3.2.4" )
+
             TAG=$(git describe --abbrev=0 --tags)
             docker login -u $DOCKER_USER -p $DOCKER_PASS
 
-            docker build -t praqma/helmsman:$TAG-helm-v3.1.3 --build-arg GLOBAL_HELM_VERSION=v3.1.3 . --no-cache
-            docker push praqma/helmsman:$TAG-helm-v3.1.3
-
-            docker build -t praqma/helmsman:$TAG-helm-v3.2.4 --build-arg GLOBAL_HELM_VERSION=v3.2.4 . --no-cache
-            docker push praqma/helmsman:$TAG-helm-v3.2.4
+            for HELM_VERSION in "${helm_versions[@]}"
+            do
+              docker build -t praqma/helmsman:$TAG-helm-$HELM_VERSION --build-arg GLOBAL_HELM_VERSION=$HELM_VERSION . --no-cache
+              docker push praqma/helmsman:$TAG-helm-$HELM_VERSION
+            done
 
 workflows:
   version: 2
diff --git a/Dockerfile b/Dockerfile
index 5e63c5c9..b6fcb88f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GO_VERSION="1.13.8"
-ARG ALPINE_VERSION="3.11"
-ARG GLOBAL_KUBE_VERSION="v1.14.10"
-ARG GLOBAL_HELM_VERSION="v3.1.1"
-ARG GLOBAL_HELM_DIFF_VERSION="v3.1.1"
+ARG GO_VERSION="1.15.2"
+ARG ALPINE_VERSION="3.12"
+ARG GLOBAL_KUBE_VERSION="v1.19.0"
+ARG GLOBAL_HELM_VERSION="v3.3.4"
+ARG GLOBAL_HELM_DIFF_VERSION="v3.1.3"
 
 ### Helm Installer ###
 FROM alpine:${ALPINE_VERSION} as helm-installer