diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a173edc..c430cd6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,6 @@ dockerimage_builder:
     - docker push $DOCKER_IMAGE_BUILDER
   tags:
     - fablab
-    - ssd
   except:
     refs:
       - schedules
@@ -46,7 +45,6 @@ dockerimage_security_scanner:
     - docker push $DOCKER_IMAGE_SECURITY_SCANNER
   tags:
     - fablab
-    - ssd
   except:
     refs:
       - schedules
@@ -66,7 +64,7 @@ security_scanner:
       - $task == "security-scanner"
       - $target
   tags:
-    - dedicated
+    - fablab
 
 .squashfs_template: &squashfs_template
   image: $DOCKER_IMAGE_BUILDER