diff --git a/main/postmarketos-demos/APKBUILD b/main/postmarketos-demos/APKBUILD
index 677df226b..b5615e1a7 100644
--- a/main/postmarketos-demos/APKBUILD
+++ b/main/postmarketos-demos/APKBUILD
@@ -3,7 +3,7 @@ pkgver=6
 pkgrel=0
 pkgdesc="Simple touch menu for a few demo programs"
 url="https://postmarketos.org"
-arch="x86_64 armhf aarch64"
+arch="all"
 license="GPL3+"
 depends="weston-xwayland dbus"
 makedepends="gtk+3.0-dev"
diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD
index 7b8a03443..b7cdcf0e6 100644
--- a/main/postmarketos-ui-weston/APKBUILD
+++ b/main/postmarketos-ui-weston/APKBUILD
@@ -3,7 +3,7 @@ pkgver=4
 pkgrel=7
 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)"
 url="https://postmarketos.org"
-arch="x86_64 armhf aarch64"
+arch="noarch"
 license="GPL3+"
 depends="weston-clients weston weston-shell-desktop weston-backend-fbdev
         weston-backend-drm weston-backend-x11 weston-terminal