diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 189461d6..9860ad65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -191,12 +191,12 @@ ubuntu:18.04@docker-check:
   stage: docker_prep
   services:
     - docker:dind
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
     # if the check was successful, we just skip recreating the docker image
     - test -e .img_ready && exit 0
 
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+
     # create a Dockerfile with our dependencies
     - echo "FROM fedora:$FEDORA_VERSION" > Dockerfile
     - echo "WORKDIR /app" >> Dockerfile
@@ -233,12 +233,12 @@ fedora:27@docker-prep:
   stage: docker_prep
   services:
     - docker:dind
-  before_script:
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   script:
     # if the check was successful, we just skip recreating the docker image
     - test -e .img_ready && exit 0
 
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+
     # create a Dockerfile with our dependencies
     - echo "FROM ubuntu:$UBUNTU_VERSION" > Dockerfile
     - echo "WORKDIR /app" >> Dockerfile