diff --git a/device/testing/device-fairphone-fp5/APKBUILD b/device/testing/device-fairphone-fp5/APKBUILD
index e2ac75f08..b079af88d 100644
--- a/device/testing/device-fairphone-fp5/APKBUILD
+++ b/device/testing/device-fairphone-fp5/APKBUILD
@@ -3,24 +3,20 @@
 pkgname=device-fairphone-fp5
 pkgdesc="Fairphone 5"
 pkgver=3
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
-	bootmac
 	linux-postmarketos-qcom-sc7280
 	make-dynpart-mappings
-	mesa-vulkan-freedreno
 	mkbootimg
 	postmarketos-base
-	qbootctl
-	qbootctl-openrc
-	swclock-offset
+	soc-qcom-sc7280
+	soc-qcom-sc7280-qbootctl
 "
 makedepends="devicepkg-dev"
-install="$pkgname.post-install $pkgname.post-upgrade"
 source="
 	deviceinfo
 	modules-initfs
@@ -59,13 +55,7 @@ nonfree_firmware() {
 		firmware-fairphone-fp5-venus
 		firmware-fairphone-fp5-wpss
 		firmware-qcom-adreno-a660
-		linux-firmware-ath11k
-		msm-modem
-		msm-modem-uim-selection
-		pd-mapper
-		tqftpserv
 		"
-	install="$subpkgname.post-install"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/device-fairphone-fp5/device-fairphone-fp5-nonfree-firmware.post-install b/device/testing/device-fairphone-fp5/device-fairphone-fp5-nonfree-firmware.post-install
deleted file mode 100644
index 70b9e0efe..000000000
--- a/device/testing/device-fairphone-fp5/device-fairphone-fp5-nonfree-firmware.post-install
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/testing/device-fairphone-fp5/device-fairphone-fp5.post-install b/device/testing/device-fairphone-fp5/device-fairphone-fp5.post-install
deleted file mode 100644
index 1ce77a594..000000000
--- a/device/testing/device-fairphone-fp5/device-fairphone-fp5.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rc-update add qbootctl default
diff --git a/device/testing/device-fairphone-fp5/device-fairphone-fp5.post-upgrade b/device/testing/device-fairphone-fp5/device-fairphone-fp5.post-upgrade
deleted file mode 120000
index a37ee235a..000000000
--- a/device/testing/device-fairphone-fp5/device-fairphone-fp5.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-fairphone-fp5.post-install
\ No newline at end of file