diff --git a/aports/device/linux-postmarketos-qcom-milos/APKBUILD b/aports/device/linux-postmarketos-qcom-milos/APKBUILD
index fbe947c..c7c3224 100644
--- a/aports/device/linux-postmarketos-qcom-milos/APKBUILD
+++ b/aports/device/linux-postmarketos-qcom-milos/APKBUILD
@@ -8,7 +8,7 @@ _flavor="postmarketos-qcom-milos"
 pkgname=linux-$_flavor
 pkgver=7.2.0
 # always sorts above the upstream aport (r0..r99)
-pkgrel=102
+pkgrel=101
 pkgdesc="Milos mainline kernel + Catcrafts FP6 bring-up carries (combined-stable)"
 arch="aarch64"
 _carch="arm64"
@@ -57,14 +57,7 @@ prepare() {
 
 build() {
 	unset LDFLAGS
-	# Build for the cores this image runs on: 4x Cortex-A520 + 4x Cortex-A720.
-	# The stock arm64 build gives the compiler no arch flag so one image boots
-	# any Armv8 board; this one boots the FP6. armv8.6-a is the highest level
-	# whose mandatory set the phone exposes (8.7 would assume WFxT, 9.x SVE2;
-	# neither is in its hwcaps); +fp16fml+aes+sha3+sm4 are the optional
-	# extensions it has, the same set `gcc -march=native` derives on the phone.
 	make ARCH="$_carch" LLVM=1 \
-		KCFLAGS="-march=armv8.6-a+fp16fml+aes+sha3+sm4 -mtune=cortex-a720" \
 		KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-$_flavor"
 }
 
diff --git a/aports/temp/libcamera/APKBUILD b/aports/temp/libcamera/APKBUILD
index 8e25f13..adb297d 100644
--- a/aports/temp/libcamera/APKBUILD
+++ b/aports/temp/libcamera/APKBUILD
@@ -3,7 +3,7 @@ maintainer="Robert Mader <robert.mader@collabora.com>"
 pkgname=libcamera
 _pkgver=0.7.2
 pkgver=9999$_pkgver
-pkgrel=10
+pkgrel=9
 pkgdesc="Linux camera framework"
 url="https://libcamera.org/"
 arch="all"
@@ -83,14 +83,6 @@ builddir="$srcdir/$pkgname-v$_pkgver"
 # gstreamer tests fail
 # manual strip because ipa .sign files depend on the file contents- have to re-sign after strip
 options="!strip !check"
-# fp6-img: this package only ever runs on the FP6 (4x Cortex-A520 + 4x
-# Cortex-A720), so build for it. armv8.6-a is the highest level whose
-# mandatory set the phone exposes (8.7 would assume WFxT, 9.x SVE2; neither
-# is in its hwcaps); +fp16fml+aes+sha3+sm4 are the optional extensions it
-# has, the same set `gcc -march=native` derives on the phone. One spelling
-# for gcc and clang, and the same string the kernel aport uses.
-export CFLAGS="$CFLAGS -march=armv8.6-a+fp16fml+aes+sha3+sm4 -mtune=cortex-a720"
-export CXXFLAGS="$CXXFLAGS -march=armv8.6-a+fp16fml+aes+sha3+sm4 -mtune=cortex-a720"
 
 case "$CARCH" in
 arm*|aarch64)
diff --git a/aports/temp/libqmi/APKBUILD b/aports/temp/libqmi/APKBUILD
index bb04704..317b7c8 100644
--- a/aports/temp/libqmi/APKBUILD
+++ b/aports/temp/libqmi/APKBUILD
@@ -7,7 +7,7 @@ maintainer="Achill Gilgenast <achill@achill.org>"
 pkgname=libqmi
 pkgver=1.39.1_git20260808
 _commit=30f3e998e6cbda364ac1bc73223de20561e6d555
-pkgrel=101
+pkgrel=100
 pkgdesc="QMI modem protocol helper library"
 url="https://www.freedesktop.org/wiki/Software/libqmi"
 arch="all"
@@ -27,13 +27,6 @@ makedepends="
 # fp6-img: crossdirect breaks meson compiler introspection (cc1 spawn
 # failure), same as modemmanager; build under plain qemu.
 options="!pmb:crossdirect"
-# fp6-img: this package only ever runs on the FP6 (4x Cortex-A520 + 4x
-# Cortex-A720), so build for it. armv8.6-a is the highest level whose
-# mandatory set the phone exposes (8.7 would assume WFxT, 9.x SVE2; neither
-# is in its hwcaps); +fp16fml+aes+sha3+sm4 are the optional extensions it
-# has, the same set `gcc -march=native` derives on the phone. One spelling
-# for gcc and clang, and the same string the kernel aport uses.
-export CFLAGS="$CFLAGS -march=armv8.6-a+fp16fml+aes+sha3+sm4 -mtune=cortex-a720"
 subpackages="
 	$pkgname-dev
 	$pkgname-doc
diff --git a/aports/temp/modemmanager/APKBUILD b/aports/temp/modemmanager/APKBUILD
index 569d1e6..95d537e 100644
--- a/aports/temp/modemmanager/APKBUILD
+++ b/aports/temp/modemmanager/APKBUILD
@@ -5,7 +5,7 @@
 maintainer="Achill Gilgenast <achill@achill.org>"
 pkgname=modemmanager
 pkgver=1.25.95_git20260709
-pkgrel=101
+pkgrel=100
 _commit=d776ea38d29ca472a12323c1d45002ee19a66f57
 pkgdesc="ModemManager library"
 url="https://www.freedesktop.org/wiki/Software/ModemManager"
@@ -42,13 +42,6 @@ checkdepends="glib-dev py3-gobject3 py3-dbus"
 # native builders, and none exercise the GNSS code our patches change) -
 # on-device validation is the real test.
 options="!pmb:crossdirect !check"
-# fp6-img: this package only ever runs on the FP6 (4x Cortex-A520 + 4x
-# Cortex-A720), so build for it. armv8.6-a is the highest level whose
-# mandatory set the phone exposes (8.7 would assume WFxT, 9.x SVE2; neither
-# is in its hwcaps); +fp16fml+aes+sha3+sm4 are the optional extensions it
-# has, the same set `gcc -march=native` derives on the phone. One spelling
-# for gcc and clang, and the same string the kernel aport uses.
-export CFLAGS="$CFLAGS -march=armv8.6-a+fp16fml+aes+sha3+sm4 -mtune=cortex-a720"
 subpackages="
 	$pkgname-lang
 	$pkgname-doc