diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index afb7f5cfc1c899a11c1aff2e1a7a21f96ca60ad0..972f3c7b8768384568af8ec89f45a81c3bce075f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,7 +32,7 @@ check:
   variables:
     GIT_DEPTH: 1
   services:
-    - registry.cyberbrain.pw/docker/dind
+    - docker:18.09.7-dind
   script:
     - drr registry.cyberbrain.pw/tools/linters/hadolint hadolint --ignore DL3007 Dockerfile
 
@@ -45,7 +45,7 @@ build:
   variables:
     GIT_DEPTH: 1
   services:
-    - registry.cyberbrain.pw/docker/dind
+    - docker:18.09.7-dind
   script:
     - docker pull "${CI_REGISTRY_IMAGE}:latest" || true
     - docker build --cache-from "${CI_REGISTRY_IMAGE}:latest" -t "${CI_REGISTRY_IMAGE}:temp-${CI_PIPELINE_IID}" -f ./Dockerfile .
@@ -62,7 +62,7 @@ test:
   services:
     - "${CI_REGISTRY_IMAGE}:temp-$CI_PIPELINE_IID"
   script:
-    - drr registry.cyberbrain.pw/docker/hello-world || true
+    - drr registry.cyberbrain.pw/docker/hello-world
 
 ##########################################################################################################
 
@@ -73,7 +73,7 @@ release:
   variables:
     GIT_STRATEGY: "none"
   services:
-    - registry.cyberbrain.pw/docker/dind
+    - docker:18.09.7-dind
   only:
     - /^trunk$/
     - /^staging$/
diff --git a/Dockerfile b/Dockerfile
index 955109bf9341bf686f6bfb4eb2327c9d55406eb4..b2bd3c88012f70ee9c7b9b2784d16c548563502d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker:dind
+FROM docker:18.09.7-dind
 
 ENV LANG C.UTF-8