diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 71b77554..306b659a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ integration:
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
     - docker-compose -f integration-test.yml pull && docker-compose -f integration-test.yml up --abort-on-container-exit --exit-code-from apicli
   tags:
-    - docker
+    - gitlab-org-docker
 
 audit:
   stage: audit
@@ -104,7 +104,7 @@ ci:
   only:
     - /(^v[0-9]+\.[0-9]+\.[0-9]+$|^master$|^develop$)/
   tags:
-    - docker
+    - gitlab-org-docker
 
 .publish_template_manual: &publish_template_manual
   image: registry.gitlab.com/openstapps/projectmanagement/builder
@@ -128,7 +128,7 @@ ci:
     - branches
   when: manual
   tags:
-    - docker
+    - gitlab-org-docker
 
 
 # Anchor templates for custom build processes
@@ -138,14 +138,14 @@ ci:
   #  - npm install "@stapps/b-tu-tickets@0.13.1"
   #  - npm install "@stapps/b-tu-isbn-availability@0.13.1"
   tags:
-    - docker
+    - gitlab-org-docker
 
 .build_template_f-u: &build_template_f-u
   # before_script:
   #  - npm install "git+ssh://git@gitlab.tubit.tu-berlin.de:stapps-f-u/feedback.git#1.0.0"
   #  - npm install "git+ssh://git@gitlab.tubit.tu-berlin.de:stapps-f-u/dish-feedback.git#1.0.0"
   tags:
-    - docker
+    - gitlab-org-docker
 
 
 # Jobs joining anchor templates with automatic publishing behaviour