diff --git a/device/device-amazon-thor/APKBUILD b/device/device-amazon-thor/APKBUILD
index 61c2cf6aa..555f769e5 100755
--- a/device/device-amazon-thor/APKBUILD
+++ b/device/device-amazon-thor/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=9
 pkgdesc="Amazon KFHDX 7inch 2013"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-amazon-thor mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
@@ -13,7 +13,7 @@ source="
 	deviceinfo
 	fb.modes
 "
-options="!check"
+options="!check !archcheck"
 
 build() {
 	devicepkg_build $startdir $pkgname
diff --git a/device/device-asus-duma/APKBUILD b/device/device-asus-duma/APKBUILD
index cf51396e9..21ff441e1 100644
--- a/device/device-asus-duma/APKBUILD
+++ b/device/device-asus-duma/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-asus-duma mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-asus-flo/APKBUILD b/device/device-asus-flo/APKBUILD
index d44438892..a1f01aec4 100644
--- a/device/device-asus-flo/APKBUILD
+++ b/device/device-asus-flo/APKBUILD
@@ -3,7 +3,7 @@ pkgver=0
 pkgrel=13
 pkgdesc="Google Nexus 7 2013 flo"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-asus-flo mkbootimg mesa mesa-egl mesa-dri-freedreno"
 makedepends=""
@@ -11,7 +11,7 @@ install=""
 subpackages="$pkgname-weston $pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-android-touch-dev.rules wpa_supplicant.conf pointercal weston.ini"
 
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir"/deviceinfo \
diff --git a/device/device-asus-grouper/APKBUILD b/device/device-asus-grouper/APKBUILD
index af1597b6b..71d6589eb 100644
--- a/device/device-asus-grouper/APKBUILD
+++ b/device/device-asus-grouper/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=14
 pkgdesc="Asus Nexus 7 2012 Wifi"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-asus-grouper mkbootimg mesa-dri-swrast"
 makedepends=""
@@ -12,7 +12,7 @@ subpackages=""
 source="deviceinfo
 	90-android-touch-dev.rules
 	pointercal"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-asus-t00f/APKBUILD b/device/device-asus-t00f/APKBUILD
index a6e9f6a52..7f6358149 100644
--- a/device/device-asus-t00f/APKBUILD
+++ b/device/device-asus-t00f/APKBUILD
@@ -4,8 +4,8 @@ pkgver=0.1
 pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="x86"
+options="!check !archcheck"
 depends="postmarketos-base linux-asus-t00f mkbootimg"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-x11"
diff --git a/device/device-asus-tf101/APKBUILD b/device/device-asus-tf101/APKBUILD
index 76d843550..cd019bcea 100644
--- a/device/device-asus-tf101/APKBUILD
+++ b/device/device-asus-tf101/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.2
 pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-asus-tf101 mkbootimg blobtools"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-asus-z00t/APKBUILD b/device/device-asus-z00t/APKBUILD
index af12d1711..db3e6623e 100644
--- a/device/device-asus-z00t/APKBUILD
+++ b/device/device-asus-z00t/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-asus-z00t mkbootimg mesa-dri-swrast libsparse msm-fb-refresher"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-bq-chaozu/APKBUILD b/device/device-bq-chaozu/APKBUILD
index ed74488e6..e9a47b5db 100644
--- a/device/device-bq-chaozu/APKBUILD
+++ b/device/device-bq-chaozu/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-bq-chaozu mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-fairphone-fp1/APKBUILD b/device/device-fairphone-fp1/APKBUILD
index a79a5d8d6..e432e9e38 100644
--- a/device/device-fairphone-fp1/APKBUILD
+++ b/device/device-fairphone-fp1/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-fairphone-fp1 mkbootimg mtk-mkimage mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-fairphone-fp2/APKBUILD b/device/device-fairphone-fp2/APKBUILD
index a0606cb54..a71edc7e5 100644
--- a/device/device-fairphone-fp2/APKBUILD
+++ b/device/device-fairphone-fp2/APKBUILD
@@ -5,8 +5,8 @@ pkgver=2
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-fairphone-fp2 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo
diff --git a/device/device-google-glass/APKBUILD b/device/device-google-glass/APKBUILD
index 3609e3439..bbef9e85e 100644
--- a/device/device-google-glass/APKBUILD
+++ b/device/device-google-glass/APKBUILD
@@ -4,8 +4,8 @@ pkgver=0.1
 pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-google-glass mkbootimg mesa-dri-swrast"
 source="deviceinfo"
 
diff --git a/device/device-gp-peak/APKBUILD b/device/device-gp-peak/APKBUILD
index 8d5e9c68c..33ae3f299 100644
--- a/device/device-gp-peak/APKBUILD
+++ b/device/device-gp-peak/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-gp-peak mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="
diff --git a/device/device-htc-a5ul/APKBUILD b/device/device-htc-a5ul/APKBUILD
index df44d8043..8a4d2ea29 100644
--- a/device/device-htc-a5ul/APKBUILD
+++ b/device/device-htc-a5ul/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-htc-a5ul mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo initfs-hook.sh"
diff --git a/device/device-htc-ace/APKBUILD b/device/device-htc-ace/APKBUILD
index e4f536e12..dd3f8ebb4 100644
--- a/device/device-htc-ace/APKBUILD
+++ b/device/device-htc-ace/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=11
 pkgdesc="HTC Desire HD"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-htc-ace mkbootimg mesa-dri-swrast"
 makedepends=""
@@ -14,7 +14,7 @@ source="
 	initfs-hook.sh
 	90-android-touch-dev.rules
 "
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir"/deviceinfo \
diff --git a/device/device-htc-bravo/APKBUILD b/device/device-htc-bravo/APKBUILD
index ac6bdcc14..88358ae3a 100644
--- a/device/device-htc-bravo/APKBUILD
+++ b/device/device-htc-bravo/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=12
 pkgdesc="HTC Desire"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-htc-bravo mkbootimg mesa-dri-swrast"
 makedepends=""
@@ -15,7 +15,7 @@ source="
 	90-android-touch-dev.rules
 	pointercal
 "
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir"/deviceinfo \
diff --git a/device/device-htc-flounder/APKBUILD b/device/device-htc-flounder/APKBUILD
index 4bb556c4e..c060fc5af 100644
--- a/device/device-htc-flounder/APKBUILD
+++ b/device/device-htc-flounder/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 url="https://postmarketos.org"
 license="gpl-v3"
 arch="aarch64"
-options="!check"
+options="!check !archcheck"
 depends="postmarketos-base linux-htc-flounder mkbootimg mesa-dri-swrast libsparse"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-htc-m8/APKBUILD b/device/device-htc-m8/APKBUILD
index 7d0848caa..0d1d62764 100644
--- a/device/device-htc-m8/APKBUILD
+++ b/device/device-htc-m8/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="linux-htc-m8 mkbootimg mesa-dri-swrast msm-fb-refresher postmarketos-base"
 makedepends="devicepkg-dev"
 source="deviceinfo
diff --git a/device/device-htc-vivo/APKBUILD b/device/device-htc-vivo/APKBUILD
index 5cfb5ea2f..b4aa41709 100644
--- a/device/device-htc-vivo/APKBUILD
+++ b/device/device-htc-vivo/APKBUILD
@@ -5,8 +5,8 @@ pkgver=1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-htc-vivo mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo initfs-hook.sh"
diff --git a/device/device-huawei-angler/APKBUILD b/device/device-huawei-angler/APKBUILD
index 137e1c2b9..7ad06575f 100644
--- a/device/device-huawei-angler/APKBUILD
+++ b/device/device-huawei-angler/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=13
 pkgdesc="Huawei Nexus 6P"
 url="https://postmarketos.org"
-arch="noarch"
+arch="aarch64"
 license="MIT"
 depends="postmarketos-base linux-huawei-angler mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
@@ -18,7 +18,7 @@ source="
 # Note: bcmdhd.cal is from https://github.com/LineageOS/android_device_huawei_angler/blob/752aaf664ab079f4ce9cbdeae6978f615d39b783/bcmdhd.cal
 # TODO: this calibration file isn't valid for all variants of this device
 # See https://github.com/LineageOS/android_device_huawei_angler/blob/cm-14.1/init.angler.rc#L450
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-huawei-y530/APKBUILD b/device/device-huawei-y530/APKBUILD
index 49052c3d6..91eaf0631 100644
--- a/device/device-huawei-y530/APKBUILD
+++ b/device/device-huawei-y530/APKBUILD
@@ -5,8 +5,8 @@ pkgver=1
 pkgrel=11
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-huawei-y530 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-infocus-flatfish/APKBUILD b/device/device-infocus-flatfish/APKBUILD
index 3bc395df1..3bcd76bee 100644
--- a/device/device-infocus-flatfish/APKBUILD
+++ b/device/device-infocus-flatfish/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-infocus-flatfish mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="
diff --git a/device/device-jolla-sbj/APKBUILD b/device/device-jolla-sbj/APKBUILD
index d21e1268c..d512b423a 100644
--- a/device/device-jolla-sbj/APKBUILD
+++ b/device/device-jolla-sbj/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-jolla-sbj mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-leeco-s2/APKBUILD b/device/device-leeco-s2/APKBUILD
index 06e603b92..e2b271d0b 100644
--- a/device/device-leeco-s2/APKBUILD
+++ b/device/device-leeco-s2/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-leeco-s2 mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-lenovo-karate/APKBUILD b/device/device-lenovo-karate/APKBUILD
index 09ef00bee..1700daff9 100644
--- a/device/device-lenovo-karate/APKBUILD
+++ b/device/device-lenovo-karate/APKBUILD
@@ -4,8 +4,8 @@ pkgver=0.1
 pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-lenovo-karate mkbootimg mdss-fb-init-hack mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-lg-bullhead/APKBUILD b/device/device-lg-bullhead/APKBUILD
index 08ff5fe15..30440cfb4 100644
--- a/device/device-lg-bullhead/APKBUILD
+++ b/device/device-lg-bullhead/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-lg-bullhead mkbootimg mesa-dri-swrast libsparse msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-lg-d285/APKBUILD b/device/device-lg-d285/APKBUILD
index 58d71ed54..2b7300ebe 100644
--- a/device/device-lg-d285/APKBUILD
+++ b/device/device-lg-d285/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=6
 pkgdesc="LG L65"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-lg-d285 mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
@@ -14,7 +14,7 @@ source="
 	initfs-hook.sh
 	90-android-touch-dev.rules
 "
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-lg-d855/APKBUILD b/device/device-lg-d855/APKBUILD
index 380d0dfe7..99041d211 100644
--- a/device/device-lg-d855/APKBUILD
+++ b/device/device-lg-d855/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=15
 pkgdesc="LG G3 International"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-lg-d855 mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
 source="deviceinfo 90-android-touch-dev.rules"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-lg-dory/APKBUILD b/device/device-lg-dory/APKBUILD
index b942c40dd..d30feb3ca 100644
--- a/device/device-lg-dory/APKBUILD
+++ b/device/device-lg-dory/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=8
 pkgdesc="LG G Watch"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-lg-dory mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
 source="deviceinfo 90-touchscreen-dev.rules"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir"/deviceinfo \
diff --git a/device/device-lg-h815/APKBUILD b/device/device-lg-h815/APKBUILD
index a5846a1f9..3001b28ce 100644
--- a/device/device-lg-h815/APKBUILD
+++ b/device/device-lg-h815/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-lg-h815 mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-lg-hammerhead/APKBUILD b/device/device-lg-hammerhead/APKBUILD
index f133dd134..bf6221f32 100644
--- a/device/device-lg-hammerhead/APKBUILD
+++ b/device/device-lg-hammerhead/APKBUILD
@@ -3,7 +3,7 @@ pkgver=2
 pkgrel=1
 pkgdesc="Google Nexus 5"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-postmarketos-qcom mkbootimg mesa-dri-freedreno ofono"
 makedepends=""
@@ -16,7 +16,7 @@ source="
 	modules-load.conf
 	brcmfmac4339-sdio.txt
 "
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -Dm644 "$srcdir"/deviceinfo \
diff --git a/device/device-lg-lenok/APKBUILD b/device/device-lg-lenok/APKBUILD
index d05902861..64cc91bb5 100644
--- a/device/device-lg-lenok/APKBUILD
+++ b/device/device-lg-lenok/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=10
 pkgdesc="LG G Watch R"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-lg-lenok mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
 source="deviceinfo initfs-hook.sh 90-android-touch-dev.rules fb_fix.sh"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir"/deviceinfo \
diff --git a/device/device-lg-mako/APKBUILD b/device/device-lg-mako/APKBUILD
index 990fe543e..ed94d96f0 100644
--- a/device/device-lg-mako/APKBUILD
+++ b/device/device-lg-mako/APKBUILD
@@ -3,14 +3,14 @@ pkgver=2
 pkgrel=20
 pkgdesc="Google Nexus 4"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-lg-mako mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages="$pkgname-weston"
 source="deviceinfo 90-android-touch-dev.rules profile.sh pointercal fb.modes weston.ini"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -Dm644 "$srcdir"/deviceinfo \
diff --git a/device/device-lg-w5/APKBUILD b/device/device-lg-w5/APKBUILD
index 09fb44863..6b8abd7e5 100644
--- a/device/device-lg-w5/APKBUILD
+++ b/device/device-lg-w5/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-lg-w5 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-motorola-athene/APKBUILD b/device/device-motorola-athene/APKBUILD
index 9cd8bc8e3..ed2829f66 100644
--- a/device/device-motorola-athene/APKBUILD
+++ b/device/device-motorola-athene/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-motorola-athene mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-motorola-falcon/APKBUILD b/device/device-motorola-falcon/APKBUILD
index 6a5b84070..4f01fa1da 100644
--- a/device/device-motorola-falcon/APKBUILD
+++ b/device/device-motorola-falcon/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-motorola-falcon mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-motorola-ghost/APKBUILD b/device/device-motorola-ghost/APKBUILD
index a46aa7c91..a92b09fce 100644
--- a/device/device-motorola-ghost/APKBUILD
+++ b/device/device-motorola-ghost/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-motorola-ghost mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-motorola-harpia/APKBUILD b/device/device-motorola-harpia/APKBUILD
index 56c3bed5d..8b95aa5f8 100644
--- a/device/device-motorola-harpia/APKBUILD
+++ b/device/device-motorola-harpia/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-motorola-harpia mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="
diff --git a/device/device-motorola-maserati/APKBUILD b/device/device-motorola-maserati/APKBUILD
index 4bbbc4bab..66caf0d6c 100644
--- a/device/device-motorola-maserati/APKBUILD
+++ b/device/device-motorola-maserati/APKBUILD
@@ -4,8 +4,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-motorola-maserati"
 source="deviceinfo 10-safestrap-maserati.sh"
 
diff --git a/device/device-motorola-osprey/APKBUILD b/device/device-motorola-osprey/APKBUILD
index bcc4ed683..668bd2564 100644
--- a/device/device-motorola-osprey/APKBUILD
+++ b/device/device-motorola-osprey/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=8
 pkgdesc="Motorola Moto G 3rd gen. (2015)"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-motorola-osprey mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
 source="deviceinfo initfs-hook.sh 90-android-touch-dev.rules fb-workaround.sh"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-motorola-peregrine/APKBUILD b/device/device-motorola-peregrine/APKBUILD
index c46d8d23f..18631a1e6 100644
--- a/device/device-motorola-peregrine/APKBUILD
+++ b/device/device-motorola-peregrine/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-motorola-peregrine mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware device-motorola-peregrine-x11"
diff --git a/device/device-motorola-potter/APKBUILD b/device/device-motorola-potter/APKBUILD
index 1fdf7e8c7..58f97340d 100644
--- a/device/device-motorola-potter/APKBUILD
+++ b/device/device-motorola-potter/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-motorola-potter mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-motorola-shamu/APKBUILD b/device/device-motorola-shamu/APKBUILD
index e27512058..69ac4de12 100644
--- a/device/device-motorola-shamu/APKBUILD
+++ b/device/device-motorola-shamu/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.3
 pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-motorola-shamu mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo initfs-hook.sh"
diff --git a/device/device-motorola-surnia/APKBUILD b/device/device-motorola-surnia/APKBUILD
index 1ba60a45d..6d6ecd4f0 100644
--- a/device/device-motorola-surnia/APKBUILD
+++ b/device/device-motorola-surnia/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-motorola-surnia mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-motorola-titan/APKBUILD b/device/device-motorola-titan/APKBUILD
index 5393e2dc6..f650d10c2 100644
--- a/device/device-motorola-titan/APKBUILD
+++ b/device/device-motorola-titan/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=27
 pkgdesc="Motorola Moto G 2014"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-motorola-titan mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 subpackages="$pkgname-weston $pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo 90-android-touch-dev.rules profile.sh weston.ini"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -Dm644 "$srcdir/deviceinfo" \
diff --git a/device/device-nextbit-robin/APKBUILD b/device/device-nextbit-robin/APKBUILD
index 958340f23..25b760a60 100644
--- a/device/device-nextbit-robin/APKBUILD
+++ b/device/device-nextbit-robin/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-nextbit-robin mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-nokia-n9/APKBUILD b/device/device-nokia-n9/APKBUILD
index 8efb067c8..ceb2fb981 100644
--- a/device/device-nokia-n9/APKBUILD
+++ b/device/device-nokia-n9/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=6
 pkgdesc="Nokia N9"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-nokia-n9 ofono watchdog-kick"
 makedepends=""
@@ -15,7 +15,7 @@ source="
 	weston.ini
 	$install
 "
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir"/deviceinfo \
diff --git a/device/device-nokia-n900/APKBUILD b/device/device-nokia-n900/APKBUILD
index 1782f0967..864009bb0 100644
--- a/device/device-nokia-n900/APKBUILD
+++ b/device/device-nokia-n900/APKBUILD
@@ -3,7 +3,7 @@ pkgver=2
 pkgrel=9
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-postmarketos-stable uboot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast"
 makedepends="uboot-tools kbd kbd-bkeymaps"
@@ -33,7 +33,7 @@ source="
 	i3wm/bq27200_status.sh
 	xorg.conf
 "
-options="!check"
+options="!check !archcheck"
 
 build() {
 	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n postmarketos -d "$srcdir/uboot-script.cmd" "$srcdir/boot.scr"
diff --git a/device/device-nokia-rm885/APKBUILD b/device/device-nokia-rm885/APKBUILD
index dbbfd94f3..324215216 100644
--- a/device/device-nokia-rm885/APKBUILD
+++ b/device/device-nokia-rm885/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-nokia-rm885 mkbootimg mdss-fb-init-hack mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-oneplus-bacon/APKBUILD b/device/device-oneplus-bacon/APKBUILD
index 4be6a4322..6038fe13a 100644
--- a/device/device-oneplus-bacon/APKBUILD
+++ b/device/device-oneplus-bacon/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=12
 pkgdesc="OnePlus One"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-oneplus-bacon mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages="$pkgname-weston"
 source="deviceinfo 90-android-touch-dev.rules weston.ini"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -Dm644 "$srcdir"/deviceinfo \
diff --git a/device/device-oneplus-oneplus2/APKBUILD b/device/device-oneplus-oneplus2/APKBUILD
index b23566854..b1365ee3b 100644
--- a/device/device-oneplus-oneplus2/APKBUILD
+++ b/device/device-oneplus-oneplus2/APKBUILD
@@ -4,8 +4,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-oneplus-oneplus2 mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo
diff --git a/device/device-oneplus-onyx/APKBUILD b/device/device-oneplus-onyx/APKBUILD
index 28cb02e2d..aa4e0e5bc 100644
--- a/device/device-oneplus-onyx/APKBUILD
+++ b/device/device-oneplus-onyx/APKBUILD
@@ -3,13 +3,13 @@ pkgver=1
 pkgrel=6
 pkgdesc="OnePlus X"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-oneplus-onyx mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 source="deviceinfo 90-android-touch-dev.rules fb.modes"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -Dm644 "$srcdir"/deviceinfo \
diff --git a/device/device-pine-a64lts/APKBUILD b/device/device-pine-a64lts/APKBUILD
index a33a054d1..d4995c089 100644
--- a/device/device-pine-a64lts/APKBUILD
+++ b/device/device-pine-a64lts/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-postmarketos-allwinner mesa-dri-swrast u-boot-pine64 uboot-tools"
 makedepends="devicepkg-dev"
 source="
diff --git a/device/device-qemu-aarch64/APKBUILD b/device/device-qemu-aarch64/APKBUILD
index 76aeca095..969fb2c0a 100644
--- a/device/device-qemu-aarch64/APKBUILD
+++ b/device/device-qemu-aarch64/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=13
 pkgdesc="Simulated device in qemu with vexpress soc"
 url="https://postmarketos.org"
-arch="noarch"
+arch="aarch64"
 license="MIT"
 # NOTE: 'pmbootstrap init' allows you to choose the mesa-dri-* package
 depends="postmarketos-base linux-postmarketos-stable"
 makedepends=""
 subpackages="$pkgname-weston"
 source="deviceinfo weston.ini"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir"/deviceinfo \
diff --git a/device/device-qemu-amd64/APKBUILD b/device/device-qemu-amd64/APKBUILD
index 3df5726de..2b69cc7d0 100644
--- a/device/device-qemu-amd64/APKBUILD
+++ b/device/device-qemu-amd64/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=18
 pkgdesc="Simulated device in qemu with an x86 platform"
 url="https://postmarketos.org"
-arch="noarch"
+arch="x86_64"
 license="MIT"
 # NOTE: 'pmbootstrap init' allows you to choose the mesa-dri-* package
 depends="postmarketos-base"
@@ -16,7 +16,7 @@ subpackages="
 "
 
 source="deviceinfo weston.ini"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir"/deviceinfo \
diff --git a/device/device-qemu-vexpress/APKBUILD b/device/device-qemu-vexpress/APKBUILD
index a4b21c573..f85d4845c 100644
--- a/device/device-qemu-vexpress/APKBUILD
+++ b/device/device-qemu-vexpress/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=20
 pkgdesc="Simulated device in qemu with vexpress soc"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 # NOTE: 'pmbootstrap init' allows you to choose the mesa-dri-* package
 depends="postmarketos-base linux-postmarketos-stable"
 makedepends=""
 subpackages=""
 source="deviceinfo"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir"/deviceinfo \
diff --git a/device/device-raspberry-pi/APKBUILD b/device/device-raspberry-pi/APKBUILD
index c86661c74..0ed1930c4 100644
--- a/device/device-raspberry-pi/APKBUILD
+++ b/device/device-raspberry-pi/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader"
 makedepends="devicepkg-dev"
 subpackages="
diff --git a/device/device-raspberry-pi3/APKBUILD b/device/device-raspberry-pi3/APKBUILD
index 28c4f61f6..ee64415e3 100644
--- a/device/device-raspberry-pi3/APKBUILD
+++ b/device/device-raspberry-pi3/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base raspberrypi-bootloader mesa-dri-vc4 bluetooth-raspberry-pi"
 makedepends="devicepkg-dev"
 subpackages="
diff --git a/device/device-samsung-espresso10/APKBUILD b/device/device-samsung-espresso10/APKBUILD
index 368148a27..5a44f47c5 100644
--- a/device/device-samsung-espresso10/APKBUILD
+++ b/device/device-samsung-espresso10/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-espresso10 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-samsung-gts210vewifi/APKBUILD b/device/device-samsung-gts210vewifi/APKBUILD
index 79e4cced3..5579d8e56 100644
--- a/device/device-samsung-gts210vewifi/APKBUILD
+++ b/device/device-samsung-gts210vewifi/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-gts210vewifi mkbootimg mesa-dri-swrast mdss-fb-init-hack"
 makedepends="devicepkg-dev"
 source="deviceinfo 90-sec_touchscreen.rules"
diff --git a/device/device-samsung-i747m/APKBUILD b/device/device-samsung-i747m/APKBUILD
index 386a4b80b..01020d98a 100644
--- a/device/device-samsung-i747m/APKBUILD
+++ b/device/device-samsung-i747m/APKBUILD
@@ -4,8 +4,8 @@ pkgver=0.1
 pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-i747m mkbootimg mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules fb.modes"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-samsung-i8190/APKBUILD b/device/device-samsung-i8190/APKBUILD
index 64d3d6564..85406fde4 100644
--- a/device/device-samsung-i8190/APKBUILD
+++ b/device/device-samsung-i8190/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.4
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-i8190 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-samsung-i8200/APKBUILD b/device/device-samsung-i8200/APKBUILD
index 702501ffb..28a2f2949 100644
--- a/device/device-samsung-i8200/APKBUILD
+++ b/device/device-samsung-i8200/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-i8200 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-samsung-i9003/APKBUILD b/device/device-samsung-i9003/APKBUILD
index c59700b99..dbbe36b55 100644
--- a/device/device-samsung-i9003/APKBUILD
+++ b/device/device-samsung-i9003/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=19
 pkgdesc="Samsung Galaxy SI SLC"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-samsung-i9003 libsamsung-ipc mkbootimg mesa-dri-swrast"
 makedepends=""
@@ -14,7 +14,7 @@ source="
 	90-android-touch-dev.rules
 	$install
 "
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-samsung-i9070/APKBUILD b/device/device-samsung-i9070/APKBUILD
index 846f7268c..fc99916bf 100644
--- a/device/device-samsung-i9070/APKBUILD
+++ b/device/device-samsung-i9070/APKBUILD
@@ -4,7 +4,7 @@ pkgver=1
 pkgrel=24
 pkgdesc="Samsung Galaxy S Advance"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-samsung-i9070 mesa-dri-swrast"
 makedepends="devicepkg-dev"
@@ -15,7 +15,7 @@ source="
 	initfs-hook.sh
 	modules-load.conf
 "
-options="!check"
+options="!check !archcheck"
 
 build() {
 	devicepkg_build $startdir $pkgname
diff --git a/device/device-samsung-i9100/APKBUILD b/device/device-samsung-i9100/APKBUILD
index 484226ea8..833ce8b3c 100644
--- a/device/device-samsung-i9100/APKBUILD
+++ b/device/device-samsung-i9100/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=21
 pkgdesc="Samsung Galaxy SII"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-samsung-i9100 libsamsung-ipc mesa-dri-swrast"
 makedepends=""
@@ -14,7 +14,7 @@ source="
 	90-android-touch-dev.rules
 	$install
 "
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-samsung-i9195/APKBUILD b/device/device-samsung-i9195/APKBUILD
index 3e3c3da5a..8d2c4bf77 100644
--- a/device/device-samsung-i9195/APKBUILD
+++ b/device/device-samsung-i9195/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.3
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-i9195 mkbootimg"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 makedepends="devicepkg-dev"
diff --git a/device/device-samsung-i9305/APKBUILD b/device/device-samsung-i9305/APKBUILD
index 249321d58..ebac3359f 100644
--- a/device/device-samsung-i9305/APKBUILD
+++ b/device/device-samsung-i9305/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=20
 pkgdesc="Samsung Galaxy SIII LTE"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-samsung-i9305 mkbootimg mesa-dri-swrast"
 makedepends=""
@@ -14,7 +14,7 @@ source="
 	90-android-touch-dev.rules
 	$install
 "
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-samsung-jflte/APKBUILD b/device/device-samsung-jflte/APKBUILD
index ea5568e46..da77ac94a 100644
--- a/device/device-samsung-jflte/APKBUILD
+++ b/device/device-samsung-jflte/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.5
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-jflte mkbootimg mesa-dri-swrast
 	msm-fb-refresher"
 makedepends="devicepkg-dev"
diff --git a/device/device-samsung-klte/APKBUILD b/device/device-samsung-klte/APKBUILD
index 652231690..cf8de9cdb 100644
--- a/device/device-samsung-klte/APKBUILD
+++ b/device/device-samsung-klte/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.2
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
 subpackages="
diff --git a/device/device-samsung-kminilte/APKBUILD b/device/device-samsung-kminilte/APKBUILD
index 8b13ad66e..452e113a4 100644
--- a/device/device-samsung-kminilte/APKBUILD
+++ b/device/device-samsung-kminilte/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-kminilte mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="
diff --git a/device/device-samsung-kylepro/APKBUILD b/device/device-samsung-kylepro/APKBUILD
index f981bced4..e252b2819 100644
--- a/device/device-samsung-kylepro/APKBUILD
+++ b/device/device-samsung-kylepro/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-kylepro mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-samsung-kylessopen/APKBUILD b/device/device-samsung-kylessopen/APKBUILD
index f3f6cea7d..6605c3560 100644
--- a/device/device-samsung-kylessopen/APKBUILD
+++ b/device/device-samsung-kylessopen/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-kylessopen mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-samsung-kylevess/APKBUILD b/device/device-samsung-kylevess/APKBUILD
index d607fd255..e3bae2af7 100644
--- a/device/device-samsung-kylevess/APKBUILD
+++ b/device/device-samsung-kylevess/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="linux-samsung-kylevess mkbootimg mesa-dri-swrast postmarketos-base"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-samsung-lt023g/APKBUILD b/device/device-samsung-lt023g/APKBUILD
index 0b8798a3c..518ba6819 100644
--- a/device/device-samsung-lt023g/APKBUILD
+++ b/device/device-samsung-lt023g/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-lt023g mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-samsung-maguro/APKBUILD b/device/device-samsung-maguro/APKBUILD
index e0b230e8b..2bb2d1c55 100644
--- a/device/device-samsung-maguro/APKBUILD
+++ b/device/device-samsung-maguro/APKBUILD
@@ -4,14 +4,14 @@ pkgver=2
 pkgrel=21
 pkgdesc="Google Galaxy Nexus (GSM)"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-samsung-maguro mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 install=""
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo"
-options="!check"
+options="!check !archcheck"
 
 build() {
 	devicepkg_build $startdir $pkgname
diff --git a/device/device-samsung-manta/APKBUILD b/device/device-samsung-manta/APKBUILD
index c647e528d..5027e0b8c 100644
--- a/device/device-samsung-manta/APKBUILD
+++ b/device/device-samsung-manta/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.3
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-manta mkbootimg mesa-dri-swrast watchdog-kick"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-samsung-n5110/APKBUILD b/device/device-samsung-n5110/APKBUILD
index ac2c598d8..ea8cc7f8a 100644
--- a/device/device-samsung-n5110/APKBUILD
+++ b/device/device-samsung-n5110/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-n5110 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo pointercal asound.state Kona_WM1811/hifi.conf Kona_WM1811/Kona_WM1811.conf Kona_WM1811/lp.conf 90-$pkgname.rules"
diff --git a/device/device-samsung-n7100/APKBUILD b/device/device-samsung-n7100/APKBUILD
index b0afa64e3..eacb284c5 100644
--- a/device/device-samsung-n7100/APKBUILD
+++ b/device/device-samsung-n7100/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=16
 pkgdesc="Samsung Galaxy Note II (GSM)"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-samsung-n7100 mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
 source="deviceinfo 90-android-touch-dev.rules"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-samsung-p4wifi/APKBUILD b/device/device-samsung-p4wifi/APKBUILD
index 0a5c55a38..bd99f6ab0 100644
--- a/device/device-samsung-p4wifi/APKBUILD
+++ b/device/device-samsung-p4wifi/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=7
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-p4wifi mkbootimg mesa-dri-swrast alsa-utils"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-samsung-s6500d/APKBUILD b/device/device-samsung-s6500d/APKBUILD
index 304ec8031..98f2dbf31 100644
--- a/device/device-samsung-s6500d/APKBUILD
+++ b/device/device-samsung-s6500d/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-s6500d mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-samsung-serranodsdd/APKBUILD b/device/device-samsung-serranodsdd/APKBUILD
index c1ece9ae1..0487f6f43 100644
--- a/device/device-samsung-serranodsdd/APKBUILD
+++ b/device/device-samsung-serranodsdd/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-samsung-serranodsdd mkbootimg"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-semc-anzu/APKBUILD b/device/device-semc-anzu/APKBUILD
index ca0a861ab..2a3ce1326 100644
--- a/device/device-semc-anzu/APKBUILD
+++ b/device/device-semc-anzu/APKBUILD
@@ -5,8 +5,8 @@ pkgver=1
 pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-semc-anzu msm-fb-refresher mkbootimg libsparse mesa-dri-swrast"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-semc-smultron/APKBUILD b/device/device-semc-smultron/APKBUILD
index 24fe353ea..d7c0c719f 100644
--- a/device/device-semc-smultron/APKBUILD
+++ b/device/device-semc-smultron/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-semc-smultron mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo fb.modes directfbrc"
diff --git a/device/device-sony-amami/APKBUILD b/device/device-sony-amami/APKBUILD
index cac9d04dc..1440dabcd 100644
--- a/device/device-sony-amami/APKBUILD
+++ b/device/device-sony-amami/APKBUILD
@@ -3,7 +3,7 @@ pkgver=2
 pkgrel=2
 pkgdesc="Sony Xperia Z1 Compact"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base mkbootimg mdss-fb-init-hack mesa-dri-swrast"
 makedepends=""
@@ -14,7 +14,7 @@ subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
 source="deviceinfo 90-android-touch-dev.rules fb.modes"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-sony-aries/APKBUILD b/device/device-sony-aries/APKBUILD
index 8ccc4c2f9..9c4152239 100644
--- a/device/device-sony-aries/APKBUILD
+++ b/device/device-sony-aries/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=17
 pkgdesc="Sony Xperia Z3 Compact"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-sony-aries mkbootimg mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
 source="deviceinfo 90-android-touch-dev.rules fb-workaround.sh"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-sony-castor-windy/APKBUILD b/device/device-sony-castor-windy/APKBUILD
index b1a320e69..5fd611e09 100644
--- a/device/device-sony-castor-windy/APKBUILD
+++ b/device/device-sony-castor-windy/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=14
 pkgdesc="Sony Xperia Z2 Tablet WIFI"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base mkbootimg linux-sony-castor-windy mesa-dri-freedreno"
 makedepends=""
 install=""
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="modules-load.conf deviceinfo 90-android-touch-dev.rules brcmfmac4335-sdio.txt"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-sony-coconut/APKBUILD b/device/device-sony-coconut/APKBUILD
index 44f1eb933..0c53298f2 100644
--- a/device/device-sony-coconut/APKBUILD
+++ b/device/device-sony-coconut/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-sony-coconut mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-sony-honami/APKBUILD b/device/device-sony-honami/APKBUILD
index 009fca482..6aaf763a3 100644
--- a/device/device-sony-honami/APKBUILD
+++ b/device/device-sony-honami/APKBUILD
@@ -4,8 +4,8 @@ pkgver=1.0
 pkgrel=6
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-sony-honami msm-fb-refresher mkbootimg mesa-dri-swrast"
 source="deviceinfo 90-android-touch-dev.rules"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-sony-nicki/APKBUILD b/device/device-sony-nicki/APKBUILD
index 1686eff23..bd40850da 100755
--- a/device/device-sony-nicki/APKBUILD
+++ b/device/device-sony-nicki/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-sony-nicki mkbootimg mesa-dri-swrast mdss-fb-init-hack msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo 90-android-touch-dev.rules screen-workaround.sh fb.modes pointercal"
diff --git a/device/device-sony-scorpion/APKBUILD b/device/device-sony-scorpion/APKBUILD
index 58edb0be5..85642ee9d 100644
--- a/device/device-sony-scorpion/APKBUILD
+++ b/device/device-sony-scorpion/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-sony-scorpion mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-sony-seagull/APKBUILD b/device/device-sony-seagull/APKBUILD
index 3a15237b0..3a78a02de 100644
--- a/device/device-sony-seagull/APKBUILD
+++ b/device/device-sony-seagull/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-sony-seagull mdss-fb-init-hack mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-sony-sirius/APKBUILD b/device/device-sony-sirius/APKBUILD
index d1276a91b..e6483eb14 100644
--- a/device/device-sony-sirius/APKBUILD
+++ b/device/device-sony-sirius/APKBUILD
@@ -3,7 +3,7 @@ pkgver=1
 pkgrel=1
 pkgdesc="Sony Xperia Z2 device package"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-postmarketos-qcom mkbootimg mesa-dri-freedreno"
 makedepends=""
@@ -16,7 +16,7 @@ source="
 	modules-load.conf
 	brcmfmac4339-sdio.txt
 "
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir"/modules-load.conf \
diff --git a/device/device-sony-yuga/APKBUILD b/device/device-sony-yuga/APKBUILD
index e0f196107..19b991b7e 100644
--- a/device/device-sony-yuga/APKBUILD
+++ b/device/device-sony-yuga/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=12
 pkgdesc="Sony Xperia Z"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-sony-yuga mkbootimg msm-fb-refresher mesa-dri-swrast"
 makedepends=""
 install=""
 subpackages=""
 source="deviceinfo 90-android-touch-dev.rules"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -D -m644 "$srcdir/deviceinfo" \
diff --git a/device/device-t2m-flame/APKBUILD b/device/device-t2m-flame/APKBUILD
index 30d29bd8c..9690589c0 100644
--- a/device/device-t2m-flame/APKBUILD
+++ b/device/device-t2m-flame/APKBUILD
@@ -3,14 +3,14 @@ pkgver=1
 pkgrel=13
 pkgdesc="Mozilla Flame"
 url="https://postmarketos.org"
-arch="noarch"
+arch="armhf"
 license="MIT"
 depends="postmarketos-base linux-t2m-flame mkbootimg mesa-dri-swrast"
 makedepends=""
 install="$pkgname.post-install"
 source="deviceinfo 90-android-touch-dev.rules $install"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-options="!check"
+options="!check !archcheck"
 
 package() {
 	install -Dm644 "$srcdir"/deviceinfo \
diff --git a/device/device-teclast-x80pro/APKBUILD b/device/device-teclast-x80pro/APKBUILD
index 1254988af..f78038b55 100644
--- a/device/device-teclast-x80pro/APKBUILD
+++ b/device/device-teclast-x80pro/APKBUILD
@@ -7,8 +7,8 @@ pkgver=1.0
 pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="x86_64"
+options="!check !archcheck"
 depends="postmarketos-base linux-teclast-x80pro"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-wiko-lenny3/APKBUILD b/device/device-wiko-lenny3/APKBUILD
index d5dc5441e..7c664322f 100644
--- a/device/device-wiko-lenny3/APKBUILD
+++ b/device/device-wiko-lenny3/APKBUILD
@@ -4,8 +4,8 @@ pkgver=0.1
 pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-wiko-lenny3 mkbootimg mesa-dri-swrast"
 source="deviceinfo"
 
diff --git a/device/device-wingtech-wt88047/APKBUILD b/device/device-wingtech-wt88047/APKBUILD
index 1384a6603..7038555cd 100644
--- a/device/device-wingtech-wt88047/APKBUILD
+++ b/device/device-wingtech-wt88047/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-wingtech-wt88047 mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-xiaomi-armani/APKBUILD b/device/device-xiaomi-armani/APKBUILD
index f376c3648..0d8362740 100644
--- a/device/device-xiaomi-armani/APKBUILD
+++ b/device/device-xiaomi-armani/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=5
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-xiaomi-armani mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
diff --git a/device/device-xiaomi-cancro/APKBUILD b/device/device-xiaomi-cancro/APKBUILD
index abb934e46..2c48e71b4 100644
--- a/device/device-xiaomi-cancro/APKBUILD
+++ b/device/device-xiaomi-cancro/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-xiaomi-cancro mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-xiaomi-ido/APKBUILD b/device/device-xiaomi-ido/APKBUILD
index fd0388232..0cb102ac8 100644
--- a/device/device-xiaomi-ido/APKBUILD
+++ b/device/device-xiaomi-ido/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=4
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-xiaomi-ido mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo
diff --git a/device/device-xiaomi-mido/APKBUILD b/device/device-xiaomi-mido/APKBUILD
index 9078cf6f5..69aa7d9a8 100644
--- a/device/device-xiaomi-mido/APKBUILD
+++ b/device/device-xiaomi-mido/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-xiaomi-mido mkbootimg mesa-dri-swrast mdss-fb-init-hack"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
diff --git a/device/device-xiaomi-santoni/APKBUILD b/device/device-xiaomi-santoni/APKBUILD
index 1de428343..ee5ef9601 100644
--- a/device/device-xiaomi-santoni/APKBUILD
+++ b/device/device-xiaomi-santoni/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="aarch64"
+options="!check !archcheck"
 depends="postmarketos-base linux-xiaomi-santoni mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
 source="deviceinfo"
diff --git a/device/device-zte-kis3/APKBUILD b/device/device-zte-kis3/APKBUILD
index 1463d4823..880f3b8c6 100644
--- a/device/device-zte-kis3/APKBUILD
+++ b/device/device-zte-kis3/APKBUILD
@@ -5,8 +5,8 @@ pkgver=0.1
 pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="noarch"
-options="!check"
+arch="armhf"
+options="!check !archcheck"
 depends="postmarketos-base linux-zte-kis3 mkbootimg mesa-dri-swrast"
 makedepends="devicepkg-dev"
 source="deviceinfo"