diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3f9aed91d7e71d790684708dbd9838a3ae8c53a..ccd853d4045897aa98f639b0fd19893b3be55c08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,17 +116,12 @@ info:
 test:
   tags: [docker]
   services:
-    - docker:24.0.5-dind
-  before_script:
-    - docker info
+    - docker:20.10-dind
   variables:
     # This is a workaround for the gitlab-runner health check mechanism when
     # using docker-dind service.  The runner will otherwise guess the port
     # wrong and the health check will timeout.
-    #SERVICE_PORT_2376_TCP_PORT: 2375
-    DOCKER_HOST: tcp://docker:2375
-    # This instructs Docker not to start over TLS.
-    DOCKER_TLS_CERTDIR: ""
+    SERVICE_PORT_2376_TCP_PORT: 2375
   stage: test
   image: $CI_REGISTRY_IMAGE_BASE
   needs: [cert]