diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f817e634b94f4d1c26bc6de522737f8ea626b1a..77b0063141775406edcbde4c0bbd1c7d05ad651f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ Build Lasertracker:
         - requirements.txt
         - .gitlab-ci.yml
   tags:
-    - frodo
+    - MQ-MARSEDGE
   script:
     - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/lasertracker -f ./src/lasertracker/Dockerfile --no-cache .
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
@@ -23,7 +23,7 @@ Build Monitoring:
   image: docker:20.10
   stage: build
   tags:
-    - frodo
+    - MQ-MARSEDGE
   rules:
     - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
       changes:
@@ -45,7 +45,7 @@ Build Robot:
         - requirements.txt
         - .gitlab-ci.yml
   tags:
-    - frodo
+    - MQ-MARSEDGE
   script:
     - docker build -t $CI_REGISTRY/$CI_PROJECT_PATH/robot -f ./src/robot/Dockerfile --no-cache .
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY