diff --git a/extra-repos/systemd/gnome-shell-mobile/APKBUILD b/extra-repos/systemd/gnome-shell-mobile/APKBUILD
index e757e2aad..99fb7af09 100644
--- a/extra-repos/systemd/gnome-shell-mobile/APKBUILD
+++ b/extra-repos/systemd/gnome-shell-mobile/APKBUILD
@@ -8,8 +8,8 @@ pkgver=9999$_pkgver
 pkgrel=1
 pkgdesc="GNOME shell mobile"
 url="https://wiki.gnome.org/Projects/GnomeShell"
-# gjs / riscv64: mutter-mobile
-arch="all !armhf !s390x !riscv64"
+# armhf: mutter-mobile, gjs
+arch="all !armhf"
 license="GPL-2.0-or-later"
 depends="
 	accountsservice
diff --git a/extra-repos/systemd/mutter-mobile/APKBUILD b/extra-repos/systemd/mutter-mobile/APKBUILD
index 0e02353d0..37f0221e4 100644
--- a/extra-repos/systemd/mutter-mobile/APKBUILD
+++ b/extra-repos/systemd/mutter-mobile/APKBUILD
@@ -8,10 +8,8 @@ pkgver=9999$_pkgver
 pkgrel=0
 pkgdesc="clutter-based window manager and compositor"
 url="https://wiki.gnome.org/Projects/Mutter/"
-# ricsv64: doesn't build currently:
-# https://builds.sr.ht/~postmarketos/job/869829#task-pmbootstrap_build-1224
 # armhf: pmb#2618
-arch="all !riscv64 !armhf"
+arch="all !armhf"
 license="GPL-2.0-or-later"
 depends="
 	gnome-settings-daemon-mobile
diff --git a/temp/gnome-shell-mobile/APKBUILD b/temp/gnome-shell-mobile/APKBUILD
index 2376df5bb..7e41f921b 100644
--- a/temp/gnome-shell-mobile/APKBUILD
+++ b/temp/gnome-shell-mobile/APKBUILD
@@ -7,8 +7,8 @@ pkgver=48.0
 pkgrel=5
 pkgdesc="GNOME shell"
 url="https://wiki.gnome.org/Projects/GnomeShell"
-# gjs / riscv64: mutter-mobile
-arch="all !armhf !s390x !riscv64"
+# armhf: gjs -> mozjs
+arch="all !armhf"
 license="GPL-2.0-or-later"
 depends="
 	accountsservice
diff --git a/temp/mutter-mobile/APKBUILD b/temp/mutter-mobile/APKBUILD
index f97270bda..ea2905508 100644
--- a/temp/mutter-mobile/APKBUILD
+++ b/temp/mutter-mobile/APKBUILD
@@ -7,9 +7,7 @@ pkgver=48.0
 pkgrel=2
 pkgdesc="clutter-based window manager and compositor"
 url="https://wiki.gnome.org/Projects/Mutter/"
-# ricsv64: doesn't build currently:
-# https://builds.sr.ht/~postmarketos/job/869829#task-pmbootstrap_build-1224
-arch="all !riscv64"
+arch="all"
 license="GPL-2.0-or-later"
 depends="
 	gnome-settings-daemon-mobile