diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8abe30fe43..4d1a6da35b 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: c94d1580
+  CACHE_IMAGE_TAG: f4db383e 
 
 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 e5d2b57805..1cafb8bf70 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -84,6 +84,22 @@ coverage:
       - LICENSE
     expire_in: 1 week
 
+.tlinux-aarch64:
+  image: registry.gitlab.com/veloren/veloren-docker-ci/cache/release-linux-aarch64:${CACHE_IMAGE_TAG}
+  script:
+    - ln -s /dockercache/target target
+    - cat ./.gitlab/scripts/linux-aarch64.sh
+    - source ./.gitlab/scripts/linux-aarch64.sh
+    - cp -r target/aarch64-unknown-linux-gnu/release/veloren-server-cli $CI_PROJECT_DIR
+    - cp -r target/aarch64-unknown-linux-gnu/release/veloren-voxygen $CI_PROJECT_DIR
+  artifacts:
+    paths:
+      - veloren-server-cli
+      - veloren-voxygen
+      - assets/
+      - LICENSE
+    expire_in: 1 week
+
 .twindows:
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache/release-windows:${CACHE_IMAGE_TAG}
   script:
@@ -170,6 +186,12 @@ air-linux:
     - .release-nightly-tmp-fix-airshipper
   tags: ["veloren/veloren", "build", "publish", "trusted"]
 
+air-linux-aarch64:
+  extends:
+    - .tlinux-aarch64
+    - .release-nightly-tmp-fix-airshipper
+  tags: ["veloren/veloren", "build", "publish", "trusted"]
+
 air-windows:
   extends:
     - .twindows
@@ -190,6 +212,12 @@ opt-linux:
     - .optional-release
   tags: ["veloren/veloren", "build"]
 
+opt-linux-aarch64:
+  extends:
+    - .tlinux-aarch64
+    - .optional-release
+  tags: ["veloren/veloren", "build"]
+
 opt-windows:
   extends:
     - .twindows
diff --git a/.gitlab/scripts/linux-aarch64.sh b/.gitlab/scripts/linux-aarch64.sh
new file mode 100755
index 0000000000..355f8aa4a2
--- /dev/null
+++ b/.gitlab/scripts/linux-aarch64.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+export VELOREN_USERDATA_STRATEGY=executable
+export PKG_CONFIG="/usr/bin/aarch64-linux-gnu-pkg-config"
+time cargo build --target=aarch64-unknown-linux-gnu --release --no-default-features --features default-publish
+# evaluate --bin instead, last time i checked (2021-07-14) it was 2 minutes slower on release (but faster on debug)
diff --git a/.gitlab/scripts/linux.sh b/.gitlab/scripts/linux.sh
index db6cb8772e..fb32bcfe39 100755
--- a/.gitlab/scripts/linux.sh
+++ b/.gitlab/scripts/linux.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 export VELOREN_USERDATA_STRATEGY=executable
 time cargo build --release --no-default-features --features default-publish
-# eveluate --bin instead, last time i checked (2021-07-14) it was 2 minutes slower on release (but faster on debug)
+# evaluate --bin instead, last time i checked (2021-07-14) it was 2 minutes slower on release (but faster on debug)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30c41f89be..097039c7f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Campfire waypoints in towns
 - Arbitrary volume entities
 - New outfit for merchants
+- Nightly linux Aarch64 builds are now produced (distribution via airshipper will follow soon)
 
 ### Changed