diff --git a/usr/bin/archboot-aarch64-pacman-chroot-tarball.sh b/usr/bin/archboot-aarch64-pacman-chroot-tarball.sh
index 380539019..470a677f1 100755
--- a/usr/bin/archboot-aarch64-pacman-chroot-tarball.sh
+++ b/usr/bin/archboot-aarch64-pacman-chroot-tarball.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 # created by Tobias Powalowski <tpowa@archlinux.org>
-_ARCH="aarch64"
 . /etc/archboot/defaults
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/container.sh
diff --git a/usr/bin/archboot-aarch64-release.sh b/usr/bin/archboot-aarch64-release.sh
index a5f4b1243..708852f09 100755
--- a/usr/bin/archboot-aarch64-release.sh
+++ b/usr/bin/archboot-aarch64-release.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 # created by Tobias Powalowski <tpowa@archlinux.org>
-_ARCH="aarch64"
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/release.sh
 [[ -z "${1}" ]] && _usage
diff --git a/usr/bin/archboot-aarch64-server-release.sh b/usr/bin/archboot-aarch64-server-release.sh
index aa4fe9cfb..197e4ba6a 100755
--- a/usr/bin/archboot-aarch64-server-release.sh
+++ b/usr/bin/archboot-aarch64-server-release.sh
@@ -1,5 +1,4 @@
 #! /bin/bash
-_ARCH="aarch64"
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/server.sh
 _root_check
diff --git a/usr/bin/archboot-riscv64-pacman-chroot-tarball.sh b/usr/bin/archboot-riscv64-pacman-chroot-tarball.sh
index 6225ea156..54e5c163e 100755
--- a/usr/bin/archboot-riscv64-pacman-chroot-tarball.sh
+++ b/usr/bin/archboot-riscv64-pacman-chroot-tarball.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 # created by Tobias Powalowski <tpowa@archlinux.org>
-_ARCH="riscv64"
 . /etc/archboot/defaults
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/container.sh
diff --git a/usr/bin/archboot-riscv64-release.sh b/usr/bin/archboot-riscv64-release.sh
index 7013ed2c1..708852f09 100755
--- a/usr/bin/archboot-riscv64-release.sh
+++ b/usr/bin/archboot-riscv64-release.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 # created by Tobias Powalowski <tpowa@archlinux.org>
-_ARCH="riscv64"
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/release.sh
 [[ -z "${1}" ]] && _usage
diff --git a/usr/bin/archboot-riscv64-server-release.sh b/usr/bin/archboot-riscv64-server-release.sh
index feaf65ecc..197e4ba6a 100755
--- a/usr/bin/archboot-riscv64-server-release.sh
+++ b/usr/bin/archboot-riscv64-server-release.sh
@@ -1,5 +1,4 @@
 #! /bin/bash
-_ARCH="riscv64"
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/server.sh
 _root_check
diff --git a/usr/bin/archboot-x86_64-release.sh b/usr/bin/archboot-x86_64-release.sh
index fbca76d6e..602220319 100755
--- a/usr/bin/archboot-x86_64-release.sh
+++ b/usr/bin/archboot-x86_64-release.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 # created by Tobias Powalowski <tpowa@archlinux.org>
-_ARCH="x86_64"
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/release.sh
 [[ -z "${1}" ]] && _usage
diff --git a/usr/bin/archboot-x86_64-server-release.sh b/usr/bin/archboot-x86_64-server-release.sh
index 6cf51e982..9a0a90305 100755
--- a/usr/bin/archboot-x86_64-server-release.sh
+++ b/usr/bin/archboot-x86_64-server-release.sh
@@ -1,5 +1,4 @@
 #! /bin/bash
-_ARCH="x86_64"
 . /usr/lib/archboot/common.sh
 . /usr/lib/archboot/server.sh
 _root_check
diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh
index e2a49b81e..4461a47d2 100644
--- a/usr/lib/archboot/common.sh
+++ b/usr/lib/archboot/common.sh
@@ -8,10 +8,13 @@ _KEYRING="archlinux-keyring"
 if echo ${_BASENAME} | grep -qw aarch64; then
     _ARCHBOOT="archboot-arm"
     _KEYRING="${_KEYRING} archlinuxarm-keyring"
+    _ARCH="aarch64"
 elif echo ${_BASENAME} | grep -qw riscv64; then
     _ARCHBOOT="archboot-riscv"
+    _ARCH="riscv64"
 else
     _ARCHBOOT="archboot"
+    _ARCH="x86_64"
 fi
 _PACMAN_MIRROR="/etc/pacman.d/mirrorlist"
 _PACMAN_CONF="/etc/pacman.conf"