diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7933713..e954898 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,8 +75,8 @@ jobs:
           declare -A mapping
           mapping[chdig*.x86_64.rpm]=chdig-latest.x86_64.rpm
           mapping[chdig*-x86_64.pkg.tar.zst]=chdig-latest-x86_64.pkg.tar.zst
+          mapping[chdig*-x86_64.tar.gz]=chdig-latest-x86_64.tar.gz
           mapping[chdig*_amd64.deb]=chdig-latest_amd64.deb
-          mapping[chdig*_amd64.tar.gz]=chdig-latest_amd64.tar.gz
           for pattern in "${!mapping[@]}"; do
               cp $pattern ${mapping[$pattern]}
           done
diff --git a/Makefile b/Makefile
index 1eebe80..e11d723 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 debug ?=
 target ?= $(shell rustc -vV | sed -n 's|host: ||p')
-arch = $(shell rustc -Z unstable-options --print target-spec-json | jq -r .arch)
+arch = $(shell uname -m)
 
 # Version normalization for deb/rpm:
 # - trim "v" prefix