diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6bd0d26eedc17b9bf26502bc238404b4ef74d9a9..e5b7b8a2b97d5addc2a4931f5b45dff6050a26a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 default:
   services:
-    - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:20.10.9-dind
+    - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:25-dind
       alias: docker
   tags:
     - build-push-to-registry
@@ -28,10 +28,13 @@ build-test:
     - merge_requests
 
 build-push:
-  image: docker:18.09
-  services:
-    - docker:18.09-dind
   stage: build-push
+  image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:25
+  variables:
+    DOCKER_TLS_CERTDIR: ''
+    DOCKER_HOST: tcp://docker:2375/
+    DOCKER_DRIVER: overlay2
+  needs: []
   only:
     - master
     - dev