diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml
index e5d2b57805..2b137d0d8e 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -2,7 +2,7 @@ unittests:
   extends: .recompile-branch
   stage: build
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
-  tags: ["veloren/veloren", "check"]
+  tags: ["xvartest"]
   variables:
     GIT_DEPTH: 9999999999999
   script:
@@ -16,7 +16,7 @@ translation:
   extends: .release
   stage: build
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
-  tags: ["veloren/veloren", "check"]
+  tags: ["xvartest"]
   script:
     - ln -s /dockercache/target target
     - cat ./.gitlab/scripts/translation.sh
@@ -36,7 +36,7 @@ benchmarks:
   extends: .release
   stage: build
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/bench:${CACHE_IMAGE_TAG}
-  tags: ["veloren/veloren", "check", "benchmark"]
+  tags: ["xvartest"]
   script:
     - unset DISABLE_GIT_LFS_CHECK
     - ln -s /dockercache/target target
@@ -59,7 +59,7 @@ coverage:
   extends: .release
   stage: build
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/tarpaulin:${CACHE_IMAGE_TAG}
-  tags: ["veloren/veloren", "check"]
+  tags: ["xvartest"]
   script:
     - ln -s /dockercache/target target
     - cat ./.gitlab/scripts/coverage.sh
diff --git a/.gitlab/CI/check.gitlab-ci.yml b/.gitlab/CI/check.gitlab-ci.yml
index ad23e01a9e..62539f9d4d 100644
--- a/.gitlab/CI/check.gitlab-ci.yml
+++ b/.gitlab/CI/check.gitlab-ci.yml
@@ -3,7 +3,7 @@ code-quality:
   extends: .recompile-branch
   stage: check
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
-  tags: ["veloren/veloren", "check"]
+  tags: ["xvartest"]
   script:
     - ln -s /dockercache/target target
     - cat ./.gitlab/scripts/code-quality.sh
@@ -13,7 +13,7 @@ security:
   extends: .recompile-branch
   stage: check
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/quality:${CACHE_IMAGE_TAG}
-  tags: ["veloren/veloren", "check"]
+  tags: ["xvartest"]
   allow_failure: true
   script:
     - ln -s /dockercache/target target