diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 02d1edba3c..b4ba5289ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
   # https://docs.gitlab.com/ee/ci/yaml/#shallow-cloning
   GIT_DEPTH: 3
   GIT_CLEAN_FLAGS: -f
-  CACHE_IMAGE_TAG: dd8d78be
+  CACHE_IMAGE_TAG: d7756444
 
 default:
   # https://docs.gitlab.com/ee/ci/pipelines/settings.html#auto-cancel-pending-pipelines
diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml
index a58b361fb1..d601d7a12a 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -68,12 +68,12 @@ coverage:
     max: 2
 
 #linux, windows, macos builds here as template
-.tlinux:
-  image: registry.gitlab.com/veloren/veloren-docker-ci/cache/release-linux:${CACHE_IMAGE_TAG}
+.tlinux-x86_64:
+  image: registry.gitlab.com/veloren/veloren-docker-ci/cache/release-linux-x86_64:${CACHE_IMAGE_TAG}
   script:
     - ln -s /dockercache/target target
-    - cat ./.gitlab/scripts/linux.sh
-    - source ./.gitlab/scripts/linux.sh
+    - cat ./.gitlab/scripts/linux-x86_64.sh
+    - source ./.gitlab/scripts/linux-x86_64.sh
     - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR
     - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
   artifacts:
@@ -100,12 +100,12 @@ coverage:
       - LICENSE
     expire_in: 1 week
 
-.twindows:
-  image: registry.gitlab.com/veloren/veloren-docker-ci/cache/release-windows:${CACHE_IMAGE_TAG}
+.twindows-x86_64:
+  image: registry.gitlab.com/veloren/veloren-docker-ci/cache/release-windows-x86_64:${CACHE_IMAGE_TAG}
   script:
     - ln -s /dockercache/target target
-    - cat ./.gitlab/scripts/windows.sh
-    - source ./.gitlab/scripts/windows.sh
+    - cat ./.gitlab/scripts/windows-x86_64.sh
+    - source ./.gitlab/scripts/windows-x86_64.sh
     - cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
     - cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
     - cp /usr/lib/gcc/x86_64-w64-mingw32/7.3-posix/libgcc_s_seh-1.dll $CI_PROJECT_DIR
@@ -164,19 +164,19 @@ coverage:
     - export RUST_TARGET="aarch64-apple-darwin"
 
 # build on release or master
-linux:
+linux-x86_64:
   extends:
-    - .tlinux
+    - .tlinux-x86_64
     - .release
   tags: ["veloren/veloren", "build", "publish", "trusted"]
 
-windows:
+windows-x86_64:
   extends:
-    - .twindows
+    - .twindows-x86_64
     - .release
   tags: ["veloren/veloren", "build", "publish", "trusted"]
 
-macos:
+macos-x86_64:
   extends:
     - .tmacos-x86_64
     - .release
@@ -189,10 +189,10 @@ macos-aarch64:
   tags: ["veloren/veloren:macos", "build", "publish", "trusted"]
 
 # The air-* builds are the builds that Airshipper Server expects to find in the scheduled build webhook JSON.
-# Renaming these will break Airshipper downloads!
-air-linux:
+# Renaming these will break Airshipper downloads! build on schedule quickfix till airshipper 0.5
+air-linux-x86_64:
   extends:
-    - .tlinux
+    - .tlinux-x86_64
     - .release-scheduled
   tags: ["veloren/veloren", "build", "publish", "trusted"]
 
@@ -202,13 +202,13 @@ air-linux-aarch64:
     - .release-scheduled
   tags: ["veloren/veloren", "build", "publish", "trusted"]
 
-air-windows:
+air-windows-x86_64:
   extends:
-    - .twindows
+    - .twindows-x86_64
     - .release-scheduled
   tags: ["veloren/veloren", "build", "publish", "trusted"]
 
-air-macos:
+air-macos-x86_64:
   extends:
     - .tmacos-x86_64
     - .release-scheduled
@@ -221,9 +221,9 @@ air-macos-aarch64:
   tags: ["veloren/veloren:macos", "build", "publish", "trusted"]
 
 # if NOT release or master, allow optional builds
-opt-linux:
+opt-linux-x86_64:
   extends:
-    - .tlinux
+    - .tlinux-x86_64
     - .optional-release
   tags: ["veloren/veloren", "build"]
 
@@ -233,9 +233,9 @@ opt-linux-aarch64:
     - .optional-release
   tags: ["veloren/veloren", "build"]
 
-opt-windows:
+opt-windows-x86_64:
   extends:
-    - .twindows
+    - .twindows-x86_64
     - .optional-release
   tags: ["veloren/veloren", "build"]
 
diff --git a/.gitlab/CI/publish.gitlab-ci.yml b/.gitlab/CI/publish.gitlab-ci.yml
index a277f71893..7c4b18c1c0 100644
--- a/.gitlab/CI/publish.gitlab-ci.yml
+++ b/.gitlab/CI/publish.gitlab-ci.yml
@@ -21,7 +21,7 @@ docker:
     entrypoint: [""]
   tags: ["veloren/veloren", "publish", "trusted"]
   dependencies:
-    - linux
+    - linux-x86_64
   before_script:
     - ls "$CI_PROJECT_DIR/server-cli/"
   script:
@@ -38,7 +38,7 @@ docker-nightly:
     entrypoint: [""]
   tags: ["veloren/veloren", "publish", "trusted"]
   dependencies:
-    - air-linux
+    - air-linux-x86_64
   before_script:
     - ls "$CI_PROJECT_DIR/server-cli/"
   script:
diff --git a/.gitlab/scripts/linux.sh b/.gitlab/scripts/linux-x86_64.sh
similarity index 100%
rename from .gitlab/scripts/linux.sh
rename to .gitlab/scripts/linux-x86_64.sh
diff --git a/.gitlab/scripts/windows.sh b/.gitlab/scripts/windows-x86_64.sh
similarity index 100%
rename from .gitlab/scripts/windows.sh
rename to .gitlab/scripts/windows-x86_64.sh