diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44770b85..d0be2706 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ before_script:
 
 default:
   tags:
-    - docker
+    - performance
 
 stages:
   - setup
@@ -29,6 +29,8 @@ setup:
     - docker push registry.gitlab.com/openstapps/app
   cache: {} # disable irrelevant cache for this job
   before_script: [] # do not run irrelevant before script for this job
+  tags:
+    - dind
 
 build:
   stage: build
@@ -37,8 +39,6 @@ build:
   artifacts:
     paths:
       - www
-  tags:
-    - performance
 
 lint:
   stage: build