diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42ab20ee30e969c428830f1a3a7ea6b4fe72f3c0..e5ee61e2c2a448db0b1a6088e8ef6e7ceb9a0983 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,9 +44,8 @@ deploy:commit:
   extends: .docker
   variables:
     TAG: ${CI_REGISTRY_IMAGE}/commit:${CI_COMMIT_SHORT_SHA}
-  before_script:
-    - docker pull ${BUILD_TAG}
   script:
+    - docker pull ${BUILD_TAG}
     - docker tag ${BUILD_TAG} ${TAG}
     - docker push ${TAG}
 
@@ -63,8 +62,8 @@ deploy:tag:
   except:
     - /^[^v]/
     - /^v[^0-9]/
-  script:
+  variables:
+    TAG: ${CI_REGISTRY_IMAGE}:latest
+  after_script:
     - docker tag ${BUILD_TAG} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG#v}
-    - docker tag ${BUILD_TAG} ${CI_REGISTRY_IMAGE}:latest
     - docker push ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG#v}
-    - docker push ${CI_REGISTRY_IMAGE}:latest