diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 719b0dbfb0cbecea957be2fd0d0436c891165576..e311e79b07fe993a1fbc21df21ca4c6574934b8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
 
 .tags: &tags
   tags:
-    - librem5
+    - general
 
 before_script:
   - apt-get -y update
@@ -28,7 +28,7 @@ build_docs:
 
 build_meson:
   tags:
-    - librem5
+    - general
   stage: build
   artifacts:
     paths:
@@ -41,7 +41,7 @@ build_meson:
 
 build_deb:
     tags:
-        - librem5
+        - general
     stage: build
     artifacts:
       paths:
@@ -56,7 +56,7 @@ build_deb:
 build_deb:amber:
     image: pureos/amber
     tags:
-        - librem5
+        - general
     stage: build
     artifacts:
       paths:
@@ -73,7 +73,7 @@ build_deb:amber:
 build_deb:buster:
     image: "debian:buster"
     tags:
-        - librem5
+        - general
     stage: build
     artifacts:
       paths:
@@ -90,7 +90,7 @@ build_deb:buster:
 
 build_deb:arm64:
     tags:
-        - librem5:arm64
+        - general:arm64
     stage: build
     artifacts:
       paths:
@@ -105,7 +105,7 @@ build_deb:arm64:
 build_deb:arm64_buster:
     image: "debian:buster"
     tags:
-        - librem5:arm64
+        - general:arm64
     stage: build
     artifacts:
       paths:
@@ -130,7 +130,7 @@ test_lintian:
 
 test:
   tags:
-    - librem5
+    - general
   stage: test
   needs:
     - build_meson