diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 805ff0892c6c1ebe03e35baaf7672582eb00585a..d8329a8ccb421239c56847621ed1cafca4be86c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,11 +21,11 @@ build_docker:
   stage: build
   before_script:
     - export IMAGE="${DOCKER_ORG}/${DOCKER_REPO}"
-    - export TAG="latest"
+    - export BUILD_TAG="build"
     - echo "IMAGE=$IMAGE" >> build.env
-    - echo "TAG=$TAG" >> build.env
+    - echo "BUILD_TAG=$BUILD_TAG" >> build.env
   script:
-    - docker build -t ${IMAGE}:${TAG} .
+    - docker build -t ${IMAGE}:${BUILD_TAG} .
   artifacts:
     reports:
       dotenv: build.env
@@ -45,7 +45,7 @@ test_docker:
     - job: build_docker
       artifacts: true
   script:
-    - docker run --rm ${IMAGE}:${TAG} tests/test.sh
+    - docker run --rm ${IMAGE}:${BUILD_TAG} tests/test.sh
 
 publish_docker:
   stage: publish
@@ -56,10 +56,10 @@ publish_docker:
       artifacts: true
     - job: test_docker
   before_script:
-    - export IMAGE="${DOCKER_ORG}/${DOCKER_REPO}:latest"
     - export VERSION=$(grep 'version <-' ascii_alignment_pileup.R | cut -f2 -d'"')
   script:
     - echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_USER}" --password-stdin
-    - docker tag ${IMAGE}:${TAG} ${IMAGE}:${VERSION}
-    - docker push ${IMAGE}:${TAG}
+    - docker tag ${IMAGE}:${BUILD_TAG} ${IMAGE}:${VERSION}
+    - docker tag ${IMAGE}:${BUILD_TAG} ${IMAGE}:latest
     - docker push ${IMAGE}:${VERSION}
+    - docker push ${IMAGE}:latest