diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f40d15425..e73835123 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,7 @@ build-linux:
   stage: build
   image: cachyos/cachyos:latest
   tags:
-    - linux
-    - ubuntu
+    - citron-build
   before_script:
     - pacman -Syu --noconfirm
     - pacman -S --noconfirm base-devel cmake ninja pkg-config git curl wget unzip
@@ -77,8 +76,6 @@ build-android:
   image: ubuntu:24.04
   tags:
     - citron-build
-    - linux
-    - ubuntu
   before_script:
     - apt-get update -qq
     - apt-get install -y -qq openjdk-17-jdk wget unzip curl git cmake build-essential pkg-config zip glslang-tools
@@ -118,8 +115,7 @@ test-unit:
   stage: test
   image: ubuntu:24.04
   tags:
-    - linux
-    - ubuntu
+    - citron-build
   before_script:
     - apt-get update -qq
     - apt-get install -y -qq build-essential cmake ninja-build git
@@ -145,8 +141,7 @@ package-release:
   stage: package
   image: ubuntu:24.04
   tags:
-    - linux
-    - ubuntu
+    - citron-build
   dependencies:
     - build-linux
   script: