diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2001dcb..6ad0829 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1534,8 +1534,8 @@ jobs:
 
       - name: load images
         run: |
-          xz -d -k < ./cache-${{ matrix.image_name }}-amd64/${{ matrix.image_name }}-amd64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-amd64
-          xz -d -k < ./cache-${{ matrix.image_name }}-arm64/${{ matrix.image_name }}-arm64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-arm64
+          xz -d -k < ./cache-${{ matrix.image_name }}-amd64/${{ matrix.image_name }}-amd64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-amd64:latest-amd64
+          xz -d -k < ./cache-${{ matrix.image_name }}-arm64/${{ matrix.image_name }}-arm64.tar.xz | docker import - dockcross/${{ matrix.image_name }}-arm64:latest-arm64
 
       - name: Login to Docker Hub
         if: github.ref == 'refs/heads/master'
@@ -1547,11 +1547,14 @@ jobs:
       - name: deploy-multi-arch
         if: github.ref == 'refs/heads/master'
         run: |
+            docker images
 
             make ${{ matrix.image_name }}.tag-amd64
-            make ${{ matrix.image_name }}.tag-arm64
-
             make ${{ matrix.image_name }}.push-amd64
+
+            export HOST_ARCH=arm64
+            make ${{ matrix.image_name }}.tag-arm64
             make ${{ matrix.image_name }}.push-arm64
+            unset HOST_ARCH
 
             make ${{ matrix.image_name }}.push
diff --git a/Makefile b/Makefile
index 1eb2bfc..4a826d6 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ TAG_FLAG := $(or $(TAG_FLAG), --tag)
 ORG = dockcross
 
 # Host architecture
-HOST_ARCH := $(shell uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')
+HOST_ARCH := $(or $(HOST_ARCH), shell uname -m | sed -e 's/x86_64/amd64/' -e 's/aarch64/arm64/')
 
 # Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux2014-x64)
 BIN = ./bin