diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 00974ca..aa5e82e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -60,7 +60,7 @@ jobs:
         run: sudo apt install ccache ninja-build
         if: matrix.os == 'ubuntu-latest'
       - name: Build
-        run: NINJA_FLAGS=-v make package LLVM_CMAKE_FLAGS=-DLLVM_CCACHE_BUILD=ON DEB_ARCH=amd64 TAR_MACHINE=linux-amd64
+        run: NINJA_FLAGS=-v make package LLVM_CMAKE_FLAGS=-DLLVM_CCACHE_BUILD=ON
         shell: bash
       - name: Run the testsuite
         run: NINJA_FLAGS=-v make check RUNTIME=wasmtime
diff --git a/docker_build.sh b/docker_build.sh
index 6343c27..050862f 100755
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -8,7 +8,6 @@ docker build \
 
 echo "Building the package in docker image"
 mkdir -p ~/.ccache
-arch=$(dpkg --print-architecture)
 docker run --rm \
     --user $(id -u):$(id -g) \
     -v "$PWD":/workspace:Z \
@@ -16,4 +15,4 @@ docker run --rm \
     -e NINJA_FLAGS=-v \
     --tmpfs /tmp:exec \
     wasi-sdk-builder:latest \
-    make package LLVM_CMAKE_FLAGS=-DLLVM_CCACHE_BUILD=ON DEB_ARCH=$arch TAR_MACHINE=linux-$arch
+    make package LLVM_CMAKE_FLAGS=-DLLVM_CCACHE_BUILD=ON
diff --git a/tar_from_installation.sh b/tar_from_installation.sh
index ade0fcc..f239718 100755
--- a/tar_from_installation.sh
+++ b/tar_from_installation.sh
@@ -22,13 +22,14 @@ fi
 if [ -n "$4" ]; then
     MACHINE="$4"
 else
-    case "$(uname -s)" in
-        Linux*)     MACHINE=linux;;
-        Darwin*)    MACHINE=macos;;
-        CYGWIN*)    MACHINE=cygwin;;
-        MINGW*)     MACHINE=mingw;;
-        MSYS*)      MACHINE=msys;; #MSYS_NT-10.0-19043
-        *)          MACHINE="UNKNOWN"
+    case "$(uname -s):$(uname -m)" in
+        Linux*:aarch64) MACHINE=linux-arm64;;
+        Linux*:x86_64)  MACHINE=linux-amd64;;
+        Darwin*)        MACHINE=macos;;
+        CYGWIN*)        MACHINE=cygwin;;
+        MINGW*)         MACHINE=mingw;;
+        MSYS*)          MACHINE=msys;; #MSYS_NT-10.0-19043
+        *)              MACHINE="UNKNOWN"
     esac    
 fi