diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3379cca2a853ba1943651d0cb4f55b3a1da3a7d3..10aa0f8d5d429777e3d09ef67491f32b46302d89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,36 +3,10 @@ stages:
   - deploy_to_test
   - deploy_to_production
 
-workflow:
-  rules:
-    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
-      variables:
-        DOCKER_BUILD_IMAGE_TAG: ":stable"
-        DOCKER_IMAGE_TAG: ":latest"
-    - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH
-      variables:
-        DOCKER_BUILD_IMAGE_TAG: ":latest"
-        DOCKER_IMAGE_TAG: ":$CI_COMMIT_REF_NAME"
-
-
-docker-build-test:
-  variables:
-    if: main
-  # Official docker image.
-  image: docker$DOCKER_BUILD_IMAGE_TAG
-  before_script:
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-  stage: build
-  services:
-    - docker:dind
-  script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE$DOCKER_IMAGE_TAG" .
-    - docker push $CI_REGISTRY_IMAGE$DOCKER_IMAGE_TAG
-
 
 docker-build-main:
   # Official docker image.
-  image: docker$DOCKER_BUILD_IMAGE_TAG
+  image: docker:stable
   stage: build
   services:
     - docker:dind
@@ -43,7 +17,6 @@ docker-build-main:
     - docker push "$CI_REGISTRY_IMAGE"
 
 
-
 # deploy test/dev version on 'sdc-dev.astron.nl'
 docker-deploy-main-test:
   stage: deploy_to_test