diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23d146d..80f9492 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,12 +4,18 @@ stages:
 build_and_push:
     stage: build
     image: docker:24.0.7
+    variables:
+        DOCKER_HOST: tcp://docker:2375
+        DOCKER_TLS_CERTDIR: ''
     services:
         - name: docker:24.0.7-dind
+          alias: docker
           command: ['--tls=false']
     script:
+        - echo "Waiting for Docker daemon..."
+        - for i in $(seq 1 30); do docker info && break || sleep 1; done
         - echo "Logging in to registry ${REGISTRY_URL}"
-        - docker login -u "$REGISTRY_USERNAME" -p "$REGISTRY_PASSWORD" "$REGISTRY_URL"
+        - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USERNAME" --password-stdin "$REGISTRY_URL"
         - export IMAGE_NAME="${REGISTRY_URL}/${IMAGE_PATH}:${IMAGE_TAG}"
         - echo "Building image ${IMAGE_NAME}"
         - docker build -t "$IMAGE_NAME" -f ./compose/prod/Dockerfile --no-cache .