diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1cd25d0e4e2854631ea388911cea0b7782a9682..d4eb9f9f0c909d60ab6c8f4dc2eaf9405e3f2b70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,6 +41,7 @@ build-tag:
     - docker push "$IMAGE_4":$CI_COMMIT_TAG
     - docker push "$IMAGE_5":$CI_COMMIT_TAG
     - docker push "$IMAGE_6":$CI_COMMIT_TAG
+    - docker push "$IMAGE_7":$CI_COMMIT_TAG
   only:
     - tags
   artifacts:
@@ -75,7 +76,7 @@ build-master-staging:
     - docker build --cache-from "$IMAGE_6":"$TAG_USED" -t "$IMAGE_6":dev -t "$IMAGE_6":"$TAG_USED" ingestor/
     - IMAGE_7="$CI_REGISTRY_IMAGE/pvs_sftp"
     - docker pull "$IMAGE_7":"$TAG_USED" || true
-    - docker build --cache-from "$IMAGE_7":latest -t "$IMAGE_7":latest -t "$IMAGE_7":$CI_COMMIT_TAG sftp/
+    - docker build --cache-from "$IMAGE_7":latest -t "$IMAGE_7":latest -t "$IMAGE_7":"$TAG_USED"sftp/
     - cd ./testing && ./gitlab_test.sh
     - if [ $? -ne 0 ]; then exit 1; fi  # actually fail build
     - docker push "$IMAGE_1":"$TAG_USED"