diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ab9587..195d668 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,6 @@
 build-docker:
   variables:
     VID: $CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA
-    CLEAN_TAG : "version"
   rules:
     - if: $CI_COMMIT_TAG =~ /.+/
       variables:
@@ -22,13 +21,12 @@
     - apk add --no-cache git
 
   script:
-    - clean_tag="${CI_COMMIT_TAG:1}"
-    - echo "CLEAN_TAG=$(clean_tag)" >> $GITLAB_ENV
-    - docker build -f Dockerfile -t korap/kustvakt:$clean_tag .
-    - docker save korap/kustvakt:$clean_tag | xz > kustvakt-$clean_tag.tar.xz
+    - CLEAN_TAG="${CI_COMMIT_TAG:1}"
+    - docker build -f Dockerfile -t korap/kustvakt:$CLEAN_TAG .
+    - docker save korap/kustvakt:$CLEAN_TAG | xz > kustvakt-$CLEAN_TAG.tar.xz
   artifacts:
     paths:
-      - kustvakt-$CLEAN_TAG.tar.xz
+      - kustvakt-*.tar.xz
 
 push-dockerhub:
   stage: deploy