diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd33ecb8..445db324 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,14 @@
-image: docker:stable
+image: registry.gitlab.com/openstapps/projectmanagement/builder
 
 stages:
   - publish
 
 publish:version:
   stage: publish
-  artifacts:
-    untracked: true
+  variables:
+    DOCKER_DRIVER: overlay2
+  services:
+    - docker:dind
   script:
     - export CI_BUILD_SEM_VERSION=$(echo -n "$CI_BUILD_REF_NAME" | cut -c 2-)
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
@@ -23,8 +25,10 @@ publish:version:
 
 publish:branch:
   stage: publish
-  artifacts:
-    untracked: true
+  variables:
+    DOCKER_DRIVER: overlay2
+  services:
+    - docker:dind
   script:
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
     - docker build -t $CI_REGISTRY_IMAGE:$CI_BUILD_REF_NAME .