diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54560b2fb..179f2d04c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,12 +18,14 @@ cache:
   key: "$CI_COMMIT_REF_SLUG"
   policy: pull-push
 
-# Windows Build (requires Windows runner)
+# Windows Build (disabled - no Windows runner available)
 build-windows:
   stage: build
   image: mcr.microsoft.com/windows/servercore:ltsc2022
   tags:
-    - windows
+    - citron-build
+    - linux
+    - ubuntu
   before_script:
     - choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
     - choco install git -y
@@ -124,7 +126,9 @@ build-android:
   stage: build
   image: ubuntu:24.04
   tags:
-    - android
+    - citron-build
+    - linux
+    - ubuntu
   before_script:
     - apt-get update -qq
     - apt-get install -y -qq openjdk-17-jdk wget unzip