diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7df56fb..d2da91bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,19 +16,15 @@ variables:
 
 .docker-shared-settings:
   stage: "build docker image"
-  image:
-    name: jdrouet/docker-with-buildx:20.10.21-0.9.1
-    pull_policy: if-not-present
   needs: []
   tags: [ "docker" ]
   variables:
     # Docker in Docker:
-    DOCKER_HOST: tcp://docker:2375/
-    DOCKER_TLS_CERTDIR: ""
-    # Famedly runners use BTRFS, overlayfs and overlay2 often break jobs
-    DOCKER_DRIVER: btrfs
+    DOCKER_BUILDKIT: 1
+  image:
+    name: docker.io/docker
   services:
-    - name: docker:dind
+    - name: docker.io/docker:dind
       alias: docker
   script:
     - apk add openssh-client
@@ -104,6 +100,13 @@ docker:tags:
     TAG: "matrix-conduit:$CI_COMMIT_TAG"
 
 
+docker build debugging:
+  extends: .docker-shared-settings
+  rules:
+    - if: "$CI_MERGE_REQUEST_TITLE =~ /.*[Dd]ocker.*/"
+  variables:
+    TAG: "matrix-conduit-docker-tests:latest"
+
 # --------------------------------------------------------------------- #
 #  Run tests                                                            #
 # --------------------------------------------------------------------- #