diff --git a/.circleci/config.yml b/.circleci/config.yml
index 66bee81d..0c292093 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,20 +51,11 @@ jobs:
       - run:
           name: build docker images and push them to dockerhub
           command: |
-            TAG=$(git describe --abbrev=0 --tags)
             docker login -u $DOCKER_USER -p $DOCKER_PASS
-            docker build -t praqma/helmsman:$TAG-helm-v2.15.1 --build-arg HELM_VERSION=v2.15.1 --build-arg HELM_DIFF_VERSION=master dockerfile/. --no-cache
-            docker push praqma/helmsman:$TAG-helm-v2.15.1
-            docker build -t praqma/helmsman:$TAG-helm-v2.14.3 --build-arg HELM_VERSION=v2.14.3 --build-arg HELM_DIFF_VERSION=master dockerfile/. --no-cache
-            docker push praqma/helmsman:$TAG-helm-v2.14.3
-            docker build -t praqma/helmsman:$TAG-helm-v2.13.1 --build-arg HELM_VERSION=v2.13.1 --build-arg HELM_DIFF_VERSION=master dockerfile/. --no-cache
-            docker push praqma/helmsman:$TAG-helm-v2.13.1
-            docker build -t praqma/helmsman:$TAG-helm-v2.12.3 --build-arg HELM_VERSION=v2.12.3 --build-arg HELM_DIFF_VERSION=master dockerfile/. --no-cache
-            docker push praqma/helmsman:$TAG-helm-v2.12.3
-            docker build -t praqma/helmsman:$TAG-helm-v2.11.0 --build-arg HELM_VERSION=v2.11.0 --build-arg HELM_DIFF_VERSION=v2.11.0+5 dockerfile/. --no-cache
-            docker push praqma/helmsman:$TAG-helm-v2.11.0
-            docker build -t praqma/helmsman:$TAG-helm-v2.10.0 --build-arg HELM_VERSION=v2.10.0 --build-arg HELM_DIFF_VERSION=v2.10.0+1 dockerfile/. --no-cache
-            docker push praqma/helmsman:$TAG-helm-v2.10.0
+            docker build -t praqma/helmsman:$CIRCLE_TAG-helm-v2.16.7 --build-arg HELM_VERSION=v2.16.7 --build-arg HELM_DIFF_VERSION=master dockerfile/. --no-cache
+            docker push praqma/helmsman:$CIRCLE_TAG-helm-v2.16.7
+            docker build -t praqma/helmsman:$CIRCLE_TAG-helm-v2.15.2 --build-arg HELM_VERSION=v2.15.2 --build-arg HELM_DIFF_VERSION=master dockerfile/. --no-cache
+            docker push praqma/helmsman:$CIRCLE_TAG-helm-v2.15.2
 
       - run:
           name: build docker test images and push them to dockerhub