diff --git a/device/bluetooth-raspberry-pi/APKBUILD b/device/bluetooth-raspberry-pi/APKBUILD
index 61f90e718..a5b358252 100644
--- a/device/bluetooth-raspberry-pi/APKBUILD
+++ b/device/bluetooth-raspberry-pi/APKBUILD
@@ -5,12 +5,12 @@ pkgver=1
 pkgrel=0
 pkgdesc="Service and udev rule for built-in bluetooth on Raspberry Pi zero w, 3B, 3B plus"
 url="https://github.com/RPi-Distro/bluez-firmware"
-arch="noarch"
+arch="armhf aarch64"
 license="MIT"
 depends="bluez bluez-deprecated"
 install="$pkgname.post-install"
 source="pi-bluetooth.openrc 50-bluetooth-hci-auto-poweron.rules"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	cd "$srcdir"
diff --git a/device/gps-nokia-n900/APKBUILD b/device/gps-nokia-n900/APKBUILD
index e372b976e..556f9e0c2 100644
--- a/device/gps-nokia-n900/APKBUILD
+++ b/device/gps-nokia-n900/APKBUILD
@@ -3,7 +3,7 @@ pkgver=0.0
 pkgrel=0
 pkgdesc="GPS support for Nokia N900"
 url="https://gitlab.com/postmarketOS/gps-nokia-n900"
-arch="all"
+arch="armhf"
 license="GPL3"
 depends=""
 makedepends="linux-headers"
diff --git a/firmware/firmware-adreno/APKBUILD b/firmware/firmware-adreno/APKBUILD
index c0e2ec6ba..13b45f3ab 100644
--- a/firmware/firmware-adreno/APKBUILD
+++ b/firmware/firmware-adreno/APKBUILD
@@ -3,9 +3,9 @@ pkgver=1
 pkgrel=6
 pkgdesc="Firmware for adreno gpus"
 url="https://github.com/TheMuppets/proprietary_vendor_sony"
-arch="noarch"
+arch="armhf aarch64"
 license="proprietary"
-options="!check"
+options="!check !archcheck"
 
 # Sources
 _files1="a225_pm4.fw a225_pfp.fw a225p5_pm4.fw a330_pfp.fw a330_pm4.fw"
diff --git a/firmware/firmware-aosp-broadcom-wlan/APKBUILD b/firmware/firmware-aosp-broadcom-wlan/APKBUILD
index 64fc4ffcf..1069a6603 100644
--- a/firmware/firmware-aosp-broadcom-wlan/APKBUILD
+++ b/firmware/firmware-aosp-broadcom-wlan/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Broadcom Wi-Fi firmware from AOSP"
 url="https://android.googlesource.com/platform/hardware/broadcom/wlan/+/android-8.0.0_r12"
-arch="noarch"
+arch="armhf aarch64"
 license="proprietary"
 options="!check !strip !archcheck"
 
diff --git a/firmware/firmware-asus-duma/APKBUILD b/firmware/firmware-asus-duma/APKBUILD
index 8cfecc2d2..06f301e48 100644
--- a/firmware/firmware-asus-duma/APKBUILD
+++ b/firmware/firmware-asus-duma/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Firmware files for ASUS MeMO Pad FHD 10 (asus-duma)"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 depends="wcnss-wlan"
 options="!check !strip !archcheck"
diff --git a/firmware/firmware-asus-flo/APKBUILD b/firmware/firmware-asus-flo/APKBUILD
index 4e0d042e3..533c896b3 100644
--- a/firmware/firmware-asus-flo/APKBUILD
+++ b/firmware/firmware-asus-flo/APKBUILD
@@ -3,7 +3,7 @@ pkgver=0
 pkgrel=1
 pkgdesc="Firmware for asus-flo"
 url="https://developers.google.com/android/drivers#flomob30x"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check !strip !archcheck"
 
diff --git a/firmware/firmware-asus-z00t/APKBUILD b/firmware/firmware-asus-z00t/APKBUILD
index 18fd3849e..f52ef93f6 100644
--- a/firmware/firmware-asus-z00t/APKBUILD
+++ b/firmware/firmware-asus-z00t/APKBUILD
@@ -3,7 +3,7 @@ pkgver=0
 pkgrel=1
 pkgdesc="Firmware for asus-z00t"
 url="https://github.com/F2F056C4-B868-4F9D-BF2A-45B9CD317E1D/asus-z00t-firmware"
-arch="noarch"
+arch="aarch64"
 license="proprietary"
 depends="wcnss-wlan"
 options="!check !strip !archcheck"
diff --git a/firmware/firmware-fairphone-fp2/APKBUILD b/firmware/firmware-fairphone-fp2/APKBUILD
index b2994f2aa..2ccffdcf2 100644
--- a/firmware/firmware-fairphone-fp2/APKBUILD
+++ b/firmware/firmware-fairphone-fp2/APKBUILD
@@ -4,7 +4,7 @@ pkgrel=1
 pkgdesc="Firmware for Fairphone 2"
 subpackages="$pkgname-wcnss $pkgname-adsp $pkgname-modem"
 url="https://github.com/FairBlobs/firmware"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check !strip !archcheck"
 
diff --git a/firmware/firmware-huawei-y530/APKBUILD b/firmware/firmware-huawei-y530/APKBUILD
index e6b858b00..3390945e9 100644
--- a/firmware/firmware-huawei-y530/APKBUILD
+++ b/firmware/firmware-huawei-y530/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Firmware files for Huawei Ascend Y530"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 depends="wcnss-wlan"
 options="!strip !check !archcheck"
diff --git a/firmware/firmware-lenovo-karate/APKBUILD b/firmware/firmware-lenovo-karate/APKBUILD
index c4683d41e..bc61de1c2 100644
--- a/firmware/firmware-lenovo-karate/APKBUILD
+++ b/firmware/firmware-lenovo-karate/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=0
 pkgdesc="Firmware files for Lenovo K6 Power"
 url="https://postmarketos.org"
-arch="noarch"
+arch="aarch64"
 license="proprietary"
 depends="wcnss-wlan"
 options="!strip !check !archcheck"
diff --git a/firmware/firmware-lg-hammerhead/APKBUILD b/firmware/firmware-lg-hammerhead/APKBUILD
index a2d352c05..0c9c8379b 100644
--- a/firmware/firmware-lg-hammerhead/APKBUILD
+++ b/firmware/firmware-lg-hammerhead/APKBUILD
@@ -4,7 +4,7 @@ pkgrel=1
 pkgdesc="Firmware for LG hammerhead (Nexus 5)"
 subpackages="$pkgname-modem $pkgname-adsp"
 url="https://github.com/TheMuppets/proprietary_vendor_lge"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check !strip !archcheck"
 
diff --git a/firmware/firmware-motorola-titan/APKBUILD b/firmware/firmware-motorola-titan/APKBUILD
index bb2b97dba..69dbbf7a6 100644
--- a/firmware/firmware-motorola-titan/APKBUILD
+++ b/firmware/firmware-motorola-titan/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Firmware files for Motorola Moto G 2014 (titan) and Moto G 4G 2013 (peregrine)"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 depends="wcnss-wlan"
 options="!check !strip !archcheck"
diff --git a/firmware/firmware-samsung-espresso10/APKBUILD b/firmware/firmware-samsung-espresso10/APKBUILD
index ab5998b34..15aa30a24 100644
--- a/firmware/firmware-samsung-espresso10/APKBUILD
+++ b/firmware/firmware-samsung-espresso10/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=0
 pkgdesc="Samsung Galaxy Tab 2 Firmware"
 url="https://github.com/TheMuppets/proprietary_vendor_samsung"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check"
 
diff --git a/firmware/firmware-samsung-i747m/APKBUILD b/firmware/firmware-samsung-i747m/APKBUILD
index 7b2bc20b7..6f83f5280 100644
--- a/firmware/firmware-samsung-i747m/APKBUILD
+++ b/firmware/firmware-samsung-i747m/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=0
 pkgdesc="Samsung Galaxy SIII i747m Firmware"
 url="https://github.com/Zerospeed8/device_samsung_d2att"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check !strip"
 
diff --git a/firmware/firmware-samsung-i9070/APKBUILD b/firmware/firmware-samsung-i9070/APKBUILD
index e18e9022d..ae1e19655 100644
--- a/firmware/firmware-samsung-i9070/APKBUILD
+++ b/firmware/firmware-samsung-i9070/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Samsung Galaxy S Advance Firmware"
 url="https://github.com/Epirex/android_vendor_samsung_u8500"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 
 # Source
diff --git a/firmware/firmware-samsung-i9100/APKBUILD b/firmware/firmware-samsung-i9100/APKBUILD
index 4afc30b5f..fb863accf 100644
--- a/firmware/firmware-samsung-i9100/APKBUILD
+++ b/firmware/firmware-samsung-i9100/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Samsung Galaxy S II Firmware"
 url="https://github.com/TheMuppets/proprietary_vendor_samsung"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check"
 
diff --git a/firmware/firmware-samsung-i9195/APKBUILD b/firmware/firmware-samsung-i9195/APKBUILD
index a777e0d81..f822093b9 100644
--- a/firmware/firmware-samsung-i9195/APKBUILD
+++ b/firmware/firmware-samsung-i9195/APKBUILD
@@ -8,7 +8,7 @@ subpackages="$pkgname-modem $pkgname-wlan"
 url="https://forum.xda-developers.com/galaxy-s4-mini/general/modem-samsung-galaxy-s4-mini-gt-i9195-t3390780"
 url2="https://github.com/j0ki/firmware-samsung-i9195"
 url3="https://github.com/LineageOS/android_device_samsung_serrano-common"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check !strip !archcheck"
 
diff --git a/firmware/firmware-samsung-i9305/APKBUILD b/firmware/firmware-samsung-i9305/APKBUILD
index 4c8f5ce96..2a970948a 100644
--- a/firmware/firmware-samsung-i9305/APKBUILD
+++ b/firmware/firmware-samsung-i9305/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Samsung Galaxy SIII LTE Firmware"
 url="https://github.com/Androguide/android_vendor_samsung"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check !strip"
 
diff --git a/firmware/firmware-samsung-jflte/APKBUILD b/firmware/firmware-samsung-jflte/APKBUILD
index 20b2d882b..d573af500 100644
--- a/firmware/firmware-samsung-jflte/APKBUILD
+++ b/firmware/firmware-samsung-jflte/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1.1
 pkgrel=0
 pkgdesc="Samsung Galaxy S4 Firmware"
 url="https://github.com/flo071/proprietary_vendor_samsung_jf-common"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check !strip"
 
diff --git a/firmware/firmware-samsung-kylepro/APKBUILD b/firmware/firmware-samsung-kylepro/APKBUILD
index 64b83eb9a..e1ab2539a 100644
--- a/firmware/firmware-samsung-kylepro/APKBUILD
+++ b/firmware/firmware-samsung-kylepro/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=0
 pkgdesc="Samsung Galaxy Trend Plus Firmware"
 url=""https://github.com/Samsung-KYLEPROXX/android_vendor_samsung_kyleproxx
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check !strip"
 
diff --git a/firmware/firmware-samsung-maguro/APKBUILD b/firmware/firmware-samsung-maguro/APKBUILD
index 628921fc1..7bd00c95e 100644
--- a/firmware/firmware-samsung-maguro/APKBUILD
+++ b/firmware/firmware-samsung-maguro/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=0
 pkgdesc="Google Galaxy Nexus (GSM) Firmware"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 depends="firmware-aosp-broadcom-wlan"
 options="!check !strip"
diff --git a/firmware/firmware-samsung-p4wifi/APKBUILD b/firmware/firmware-samsung-p4wifi/APKBUILD
index 7fd31e73a..8c699268a 100644
--- a/firmware/firmware-samsung-p4wifi/APKBUILD
+++ b/firmware/firmware-samsung-p4wifi/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Samsung Galaxy Tab 10.1 Firmware"
 url="https://github.com/Decatf"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check"
 
diff --git a/firmware/firmware-sony-amami/APKBUILD b/firmware/firmware-sony-amami/APKBUILD
index 810c1e90a..6a0eed821 100644
--- a/firmware/firmware-sony-amami/APKBUILD
+++ b/firmware/firmware-sony-amami/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Firmware files for Xperia Z1 Compact"
 url="https://github.com/TheMuppets/proprietary_vendor_sony"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 depends="wcnss-wlan"
 options="!strip !check !archcheck"
diff --git a/firmware/firmware-t2m-flame/APKBUILD b/firmware/firmware-t2m-flame/APKBUILD
index 911279161..65d87af87 100644
--- a/firmware/firmware-t2m-flame/APKBUILD
+++ b/firmware/firmware-t2m-flame/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=4
 pkgdesc="Mozilla Flame Firmware"
 url="https://github.com/yuvadm/mozilla-flame-firmware"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 options="!check !strip !archcheck"
 
diff --git a/firmware/firmware-xiaomi-armani/APKBUILD b/firmware/firmware-xiaomi-armani/APKBUILD
index b153e749c..eba402355 100644
--- a/firmware/firmware-xiaomi-armani/APKBUILD
+++ b/firmware/firmware-xiaomi-armani/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Firmware files for Xiaomi Redmi 1S"
 url="https://github.com/TheMuppets/proprietary_vendor_xiaomi"
-arch="noarch"
+arch="armhf"
 license="proprietary"
 depends="wcnss-wlan"
 options="!strip !check !archcheck"
diff --git a/firmware/firmware-xiaomi-mido/APKBUILD b/firmware/firmware-xiaomi-mido/APKBUILD
index a754c608f..0744ccca0 100644
--- a/firmware/firmware-xiaomi-mido/APKBUILD
+++ b/firmware/firmware-xiaomi-mido/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Firmware files for Xiaomi Redmi Note 4"
 url="https://postmarketos.org"
-arch="noarch"
+arch="aarch64"
 license="proprietary"
 depends="wcnss-wlan"
 options="!strip !check !archcheck"