diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b1873a3..4749981 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,11 +3,11 @@ include:
   - template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
 
 default:
-  image: docker:git
+  image: docker:20.10.3-git
   services:
     - docker:20.10.3-dind
   before_script:
-    - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
     - source scripts/build-helpers.sh
     - apk add -U bash
   tags: