diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 1ea7e29..02dab93 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         registry: [dockerhub, ghcr]
-        platform: [linux/amd64, linux/386, linux/arm/v6, linux/arm/v7, linux/arm64/v8]
+        platform: [linux/amd64, linux/386, linux/arm/v6, linux/arm/v7, linux/arm64]
         container: [3.18]
         include:
           - registry: dockerhub
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index a087d2b..e5f2041 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -11,7 +11,7 @@ jobs:
         # Official docker images for docker are only available for amd64 and arm64
         # TODO: Look at: https://github.com/docker-library/official-images#architectures-other-than-amd64
         # Is testing on all platforms really necessary?
-        platform: [linux/amd64, linux/arm64/v8]
+        platform: [linux/amd64, linux/arm64]
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v4