diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d87bad9de63f14613ea27eff6f83659b0300b7a..b1447b35a093433e359a54e72b37ac6f92c4f23f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,8 @@ stages:
 
 make_main_fw:
   stage: make_main_fw
-  image: ohwr-ci-cluster-j6wqnazkqypt-master-0.cern.ch/arm-none-eabi-gcc-llvm-coast
+  tags:
+    - arm-clang-coast
   script:
     - cd main_fw/build && make -j5 all
   artifacts:
@@ -11,5 +12,3 @@ make_main_fw:
     paths:
     - main_fw/build/main_fw.lss
     - main_fw/build/main_fw.bin
-  tags:
-    - arm-clang-coast