diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1172b94..9b51424 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,11 +20,12 @@
     - apk add --no-cache git
 
   script:
-    - docker build -f Dockerfile -t korap/kustvakt:$VID .
-    - docker save korap/kustvakt:$VID | xz > kustvakt-$VID.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-$VID.tar.xz
+      - kustvakt-$CLEAN_TAG.tar.xz
 
 push-dockerhub:
   stage: deploy
@@ -43,7 +44,7 @@
     - apk add --no-cache xz
     - echo "$DOCKERHUB_TOKEN" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
     - CLEAN_TAG="${CI_COMMIT_TAG:1}"
-    - ARTIFACT=kustvakt-$CI_COMMIT_TAG.tar.xz
+    - ARTIFACT=kustvakt-$CLEAN_TAG.tar.xz
     - xz -d -c "$ARTIFACT" | docker load
     - docker tag korap/kustvakt:$CLEAN_TAG korap/kustvakt:latest
     - docker push korap/kustvakt:$CLEAN_TAG