diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f488ea037ce32befb70ccdb876a3e903bdac3a9..7705631dd453af02d41110971432399aaad6da12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,8 +93,6 @@ variables:
   <<: *perf_only_definition
   image: ${IMAGE_PERF_BUILT}
   stage: perf
-  tags:
-    - docker_perf
   artifacts:
     when: always
     paths:
@@ -199,7 +197,7 @@ perf_bootstrap:
   <<: *perf_only_definition
   stage: test
   tags:
-    - perf
+    - deploy
   script:
     - ${GITLAB_MAKE} perf_prepare
   after_script:
@@ -209,18 +207,24 @@ perf_bootstrap:
 
 perf_sysbench:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh3_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'sysbench'
 
 perf_tpcc:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh3_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'tpcc'
 
 perf_ycsb_hash:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh2_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'ycsb'
@@ -228,6 +232,8 @@ perf_ycsb_hash:
 
 perf_ycsb_tree:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh2_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'ycsb'
@@ -235,6 +241,8 @@ perf_ycsb_tree:
 
 perf_nosqlbench_hash:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh1_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'nosqlbench'
@@ -242,6 +250,8 @@ perf_nosqlbench_hash:
 
 perf_nosqlbench_tree:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh1_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'nosqlbench'
@@ -249,6 +259,8 @@ perf_nosqlbench_tree:
 
 perf_cbench:
   <<: *perf_docker_test_definition
+  tags:
+    - docker_sh2_perf
   variables:
     <<: *perf_vars_definition
     BENCH: 'cbench'