diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a0a22c..5d8c659 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,23 @@
-image: docker:git
-
+default:
+  image: docker:git
+  services:
+    - docker:19.03.0-dind
+  before_script:
+    - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
+    - source scripts/build-helpers.sh
+  tags:
+    - gitlab-org-docker  
+    
 stages:
   - build
   - test
   - automation
 
-services:
-  - docker:19.03.0-dind
-
 variables:
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375
   FORCE_BUILD: "false"
 
-before_script:
-  - docker login -u "gitlab-ci-token" -p "$CI_JOB_TOKEN" "$CI_REGISTRY"
-  - source scripts/build-helpers.sh
-
 .test_build: &test_build
   stage: test
   script:
@@ -26,8 +27,6 @@ before_script:
     - docker build -f "Dockerfile.$1" .
   except:
     - master
-  tags:
-    - docker
 
 .build_and_deploy: &build_and_deploy
   stage: build
@@ -36,8 +35,6 @@ before_script:
     - docker push "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
   only:
     - master
-  tags:
-    - docker
 
 .test_custom: &test_custom
   stage: test
@@ -48,8 +45,6 @@ before_script:
     - ./scripts/custom-docker-build $1
   except:
     - master
-  tags:
-    - docker
 
 .build_and_deploy_custom: &build_and_deploy_custom
   stage: build
@@ -58,8 +53,6 @@ before_script:
     - push_if_needed "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"
   only:
     - master
-  tags:
-    - docker
 
 # Tests