diff --git a/tasks/image_configuration/downgrade-wpa-hostapd/fetch.sh b/tasks/image_configuration/downgrade-wpa-hostapd/fetch.sh
index 4a9bf83..b894967 100755
--- a/tasks/image_configuration/downgrade-wpa-hostapd/fetch.sh
+++ b/tasks/image_configuration/downgrade-wpa-hostapd/fetch.sh
@@ -5,32 +5,38 @@ ROOT_DST="${DS_OVERLAY}/tmp/downgrade-wpa-hostapd"
 # Debian distros shipping wpasupplicant 2.10 are:
 # Debian 12 (Bookworm)
 if [ "${DS_DISTRO}" == "debian" ] ; then
-	LIBSSL_DEB="libssl1.1_1.1.1w-0+deb11u1_armhf.deb"
+	LIBSSL_DEB="libssl1.1_1.1.1w-0+deb11u1_${DS_TARGET_ARCH}.deb"
 	LIBSSL_SITE="http://ftp.us.debian.org/debian/pool/main/o/openssl/${LIBSSL_DEB}"
-	LIBSSL_SHA256="42130c140f972d938d4b4a5ab9638675e6d1223fcff3042bbcc1829e3646eb00"
+	[ "${DS_TARGET_ARCH}" = "arm64" ] && LIBSSL_SHA256="fe7a7d313c87e46e62e614a07137e4a476a79fc9e5aab7b23e8235211280fee3"
+	[ "${DS_TARGET_ARCH}" = "armhf" ] && LIBSSL_SHA256="42130c140f972d938d4b4a5ab9638675e6d1223fcff3042bbcc1829e3646eb00"
 
-	WPA_DEB="wpasupplicant_2.9.0-21+deb11u2_armhf.deb"
+	WPA_DEB="wpasupplicant_2.9.0-21+deb11u2_${DS_TARGET_ARCH}.deb"
 	WPA_SITE="http://ftp.us.debian.org/debian/pool/main/w/wpa/${WPA_DEB}"
-	WPA_SHA256="dce8b75e6b4d6e8a59c98b2172d553de332026bc2f8705b63e12a1e980150a5b"
+	[ "${DS_TARGET_ARCH}" = "arm64" ] && WPA_SHA256="834bad32fced528e9e8812138ae7d0d92ad7e6a92bcb60a913bebc713ad3e0b4"
+	[ "${DS_TARGET_ARCH}" = "armhf" ] && WPA_SHA256="dce8b75e6b4d6e8a59c98b2172d553de332026bc2f8705b63e12a1e980150a5b"
 
-	HOSTAPD_DEB="hostapd_2.9.0-21+deb11u2_armhf.deb"
+	HOSTAPD_DEB="hostapd_2.9.0-21+deb11u2_${DS_TARGET_ARCH}.deb"
 	HOSTAPD_SITE="http://ftp.us.debian.org/debian/pool/main/w/wpa/${HOSTAPD_DEB}"
-	HOSTAPD_SHA256="67e82fc8753f7b6379bbeaad529170ec03ec3bba414c807a67512229a7cacdae"
+	[ "${DS_TARGET_ARCH}" = "arm64" ] && HOSTAPD_SHA256="61a8c7dd81cff75298d7b0be6f5cb780f50ab31c03f80175288b41a7a2e74a4a"
+	[ "${DS_TARGET_ARCH}" = "armhf" ] && HOSTAPD_SHA256="67e82fc8753f7b6379bbeaad529170ec03ec3bba414c807a67512229a7cacdae"
 # Ubuntu distros shipping wpasupplicant 2.10 are:
 # 22.04 (Jammy)
 # 23.04 (Focal)
 elif [ "${DS_DISTRO}" == "ubuntu" ] ; then
-	LIBSSL_DEB="libssl1.1_1.1.1f-1ubuntu2_armhf.deb"
+	LIBSSL_DEB="libssl1.1_1.1.1f-1ubuntu2_${DS_TARGET_ARCH}.deb"
 	LIBSSL_SITE="http://ports.ubuntu.com/pool/main/o/openssl/${LIBSSL_DEB}"
-	LIBSSL_SHA256="fde1628edbebc3b4aba18f2568b703a4c2003e4903c4e01f899b489f4e426d3f"
+	[ "${DS_TARGET_ARCH}" = "arm64" ] && LIBSSL_SHA256="a697e5826bdbed1324f3cce1335ef162bf49eed433eb662c6d43e69ebc4807b2"
+	[ "${DS_TARGET_ARCH}" = "armhf" ] && LIBSSL_SHA256="fde1628edbebc3b4aba18f2568b703a4c2003e4903c4e01f899b489f4e426d3f"
 
-	WPA_DEB="wpasupplicant_2.9-1ubuntu4.4_armhf.deb"
+	WPA_DEB="wpasupplicant_2.9-1ubuntu4.4_${DS_TARGET_ARCH}.deb"
 	WPA_SITE="http://ports.ubuntu.com/pool/main/w/wpa/${WPA_DEB}"
-	WPA_SHA256="21108b6f429cf60644ee164c699f9dad60dbceb4f70e041583e8a390289f8db6"
+	[ "${DS_TARGET_ARCH}" = "arm64" ] && WPA_SHA256="7b422e9b0f9211ebfd765016e7249a06e26dff2f9134ccb544b1ccfe2fc93860"
+	[ "${DS_TARGET_ARCH}" = "armhf" ] && WPA_SHA256="21108b6f429cf60644ee164c699f9dad60dbceb4f70e041583e8a390289f8db6"
 
-	HOSTAPD_DEB="hostapd_2.9-1ubuntu4.4_armhf.deb"
+	HOSTAPD_DEB="hostapd_2.9-1ubuntu4.4_${DS_TARGET_ARCH}.deb"
 	HOSTAPD_SITE="http://ports.ubuntu.com/pool/universe/w/wpa/${HOSTAPD_DEB}"
-	HOSTAPD_SHA256="d1754ffae2ca6f804ba67e43f9c1296a153f3d4152f250e048ff784ecb1f7771"
+	[ "${DS_TARGET_ARCH}" = "arm64" ] && HOSTAPD_SHA256="5fd6cbd5f280f7d786493ae1801e5403d93077a4c80f25c51df1a61708727f7d"
+	[ "${DS_TARGET_ARCH}" = "armhf" ] && HOSTAPD_SHA256="d1754ffae2ca6f804ba67e43f9c1296a153f3d4152f250e048ff784ecb1f7771"
 else
 	exit 1
 fi
diff --git a/tasks/image_configuration/downgrade-wpa-hostapd/install.sh b/tasks/image_configuration/downgrade-wpa-hostapd/install.sh
index 990eb59..5eac966 100755
--- a/tasks/image_configuration/downgrade-wpa-hostapd/install.sh
+++ b/tasks/image_configuration/downgrade-wpa-hostapd/install.sh
@@ -3,13 +3,13 @@
 ROOT_DST="/tmp/downgrade-wpa-hostapd"
 
 if [ "${DS_DISTRO}" == "debian" ]; then
-	LIBSSL_DEB="libssl1.1_1.1.1w-0+deb11u1_armhf.deb"
-	WPA_DEB="wpasupplicant_2.9.0-21+deb11u2_armhf.deb"
-	HOSTAPD_DEB="hostapd_2.9.0-21+deb11u2_armhf.deb"
+	LIBSSL_DEB="libssl1.1_1.1.1w-0+deb11u1_${DS_TARGET_ARCH}.deb"
+	WPA_DEB="wpasupplicant_2.9.0-21+deb11u2_${DS_TARGET_ARCH}.deb"
+	HOSTAPD_DEB="hostapd_2.9.0-21+deb11u2_${DS_TARGET_ARCH}.deb"
 elif [ "${DS_DISTRO}" == "ubuntu" ] ; then
-	LIBSSL_DEB="libssl1.1_1.1.1f-1ubuntu2_armhf.deb"
-	WPA_DEB="wpasupplicant_2.9-1ubuntu4.4_armhf.deb"
-	HOSTAPD_DEB="hostapd_2.9-1ubuntu4.4_armhf.deb"
+	LIBSSL_DEB="libssl1.1_1.1.1f-1ubuntu2_${DS_TARGET_ARCH}.deb"
+	WPA_DEB="wpasupplicant_2.9-1ubuntu4.4_${DS_TARGET_ARCH}.deb"
+	HOSTAPD_DEB="hostapd_2.9-1ubuntu4.4_${DS_TARGET_ARCH}.deb"
 else
 	exit 1
 fi