diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d9c4970..cb563f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ test:
   except:
     - main
   tags:
-    - derby
+    - emblem-dev2
   before_script:
     - source scripts/dev-setup
   script:
@@ -25,7 +25,7 @@ build-web:
   except:
     - main
   tags:
-    - derby
+    - emblem-dev2
   before_script:
     - (cd web; npm install)
   script:
@@ -39,7 +39,7 @@ build-docker:
   except:
     - main
   tags:
-    - derby
+    - emblem-dev2
   script:
     - make docker-build
     - make docker-push
@@ -53,7 +53,7 @@ deploy-dev:
   except:
     - main
   tags:
-    - derby
+    - emblem-dev2
   only:
     - dev
   script:
@@ -66,7 +66,7 @@ dev-smoke:
   except:
     - main
   tags:
-    - derby
+    - emblem-dev2
   allow_failure: true
   script:
     - ./scripts/emcli --env dev activate 0074253255108
@@ -76,7 +76,7 @@ dev-smoke:
 deploy-prod:
   stage: deploy
   tags:
-    - derby
+    - emblem-dev2
   only:
     - main
   script: