diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e1cae51944c5c8ed692e7db938c7bb1374835cd..dea82c35937e91ec3ae444e60fb73cf75f38df40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 default:
-  image: docker:26.0.1-dind
+  image: docker:latest
 
 stages:
   - build
@@ -11,11 +11,12 @@ variables:
 
 before_script:
   - unset DOCKER_HOST
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  - echo "${CI_REGISTRY_PASSWORD}" | docker login -u "${CI_REGISTRY_USER}" --password-stdin ${CI_REGISTRY}
 
 push_docker_image:
   stage: build
-  image: docker:26.0.1-dind
+  services:
+    - docker:dind
   script:
     - docker build -t $DOCKER_IMAGE:$CI_COMMIT_SHORT_SHA -f docker/Dockerfile .
     - docker push $DOCKER_IMAGE:$CI_COMMIT_SHORT_SHA