diff --git a/.gitlab/CI/publish.gitlab-ci.yml b/.gitlab/CI/publish.gitlab-ci.yml
index 407722f225..0a0ce38f2b 100644
--- a/.gitlab/CI/publish.gitlab-ci.yml
+++ b/.gitlab/CI/publish.gitlab-ci.yml
@@ -3,7 +3,7 @@
 .publish:
   stage: publish
   tags:
-    - veloren-docker
+    - veloren-wgpu-docker
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE != "schedule"
       when: always
diff --git a/.gitlab/CI/recompile.yml b/.gitlab/CI/recompile.yml
index 2f2bdecb82..9eea0f6fe3 100644
--- a/.gitlab/CI/recompile.yml
+++ b/.gitlab/CI/recompile.yml
@@ -1,7 +1,7 @@
 # Template to only run if actual changes has been made to the code and not just documentation
 .recompile-branch:
   tags:
-    - veloren-docker
+    - veloren-wgpu-docker
   rules:
     - if: $CI_COMMIT_REF_NAME !~ /^master$/
       # No '-' here is *very* important: https://docs.gitlab.com/ee/ci/yaml/#complex-rule-clauses
@@ -15,7 +15,7 @@
 # like .recompile-branch but will run on master too
 .recompile:
   tags:
-    - veloren-docker
+    - veloren-wgpu-docker
   rules:
     - changes:
         - "**/*.{glsl,rs,ron,toml,vox,png,wav}"
diff --git a/.gitlab/CI/release.yml b/.gitlab/CI/release.yml
index 770228a596..2067391dac 100644
--- a/.gitlab/CI/release.yml
+++ b/.gitlab/CI/release.yml
@@ -2,7 +2,7 @@
 .optional-release:
   stage: check
   tags:
-    - veloren-docker
+    - veloren-wgpu-docker
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/ || $CI_PIPELINE_SOURCE == "schedule"
       when: never
@@ -13,7 +13,7 @@
 .release:
   stage: build
   tags:
-    - veloren-docker
+    - veloren-wgpu-docker
   rules:
     - if: $CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/
       when: always