diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 139e64c..9b365b9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-mips, linux-mips64, linux-mipsel, linux-s390x, linux-x64, linux-x86, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
+        arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-armv8, linux-armv8-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-mips, linux-mips64, linux-mipsel, linux-s390x, linux-x64, linux-x86, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
diff --git a/Makefile b/Makefile
index 578694c..ac2e636 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,10 @@ ORG = dockcross
 BIN = ./bin
 
 # These images are built using the "build implicit rule"
-STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-arm64 linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-mips64 linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix
+STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-armv8 linux-armv8-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-mips64 linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix
 
 # Generated Dockerfiles.
-GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-mips64 linux-mipsel manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le
+GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-mips64 linux-mipsel manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-armv8 linux-armv8-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le
 GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
 
 # These images are expected to have explicit rules for *both* build and testing
diff --git a/linux-arm64-musl/Dockerfile.in b/linux-armv8-musl/Dockerfile.in
similarity index 97%
rename from linux-arm64-musl/Dockerfile.in
rename to linux-armv8-musl/Dockerfile.in
index 7862295..46b486c 100644
--- a/linux-arm64-musl/Dockerfile.in
+++ b/linux-armv8-musl/Dockerfile.in
@@ -26,7 +26,7 @@ ENV ARCH arm64
 
 # Build-time metadata as defined at http://label-schema.org
 ARG BUILD_DATE
-ARG IMAGE=dockcross/linux-arm64-musl
+ARG IMAGE=dockcross/linux-armv8-musl
 ARG VERSION=latest
 ARG VCS_REF
 ARG VCS_URL
diff --git a/linux-arm64-musl/Toolchain.cmake b/linux-armv8-musl/Toolchain.cmake
similarity index 100%
rename from linux-arm64-musl/Toolchain.cmake
rename to linux-armv8-musl/Toolchain.cmake
diff --git a/linux-arm64/Dockerfile.in b/linux-armv8/Dockerfile.in
similarity index 100%
rename from linux-arm64/Dockerfile.in
rename to linux-armv8/Dockerfile.in
diff --git a/linux-arm64/Toolchain.cmake b/linux-armv8/Toolchain.cmake
similarity index 100%
rename from linux-arm64/Toolchain.cmake
rename to linux-armv8/Toolchain.cmake
diff --git a/linux-arm64/crosstool-ng.config b/linux-armv8/crosstool-ng.config
similarity index 100%
rename from linux-arm64/crosstool-ng.config
rename to linux-armv8/crosstool-ng.config