diff --git a/device/archived/device-lenovo-q706f/APKBUILD b/device/archived/device-lenovo-q706f/APKBUILD
index 380a7af90..c47872c45 100644
--- a/device/archived/device-lenovo-q706f/APKBUILD
+++ b/device/archived/device-lenovo-q706f/APKBUILD
@@ -3,7 +3,7 @@
 maintainer=""
 pkgname=device-lenovo-q706f
 pkgdesc="Lenovo Xiaoxin Pad Pro 12.6 (Lenovo Tab P12 Pro)"
-pkgver=7
+pkgver=8
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -80,7 +80,6 @@ nonfree_firmware() {
 		firmware-lenovo-q706f-venus
 		linux-firmware-ath11k
 		linux-firmware-qca
-		pd-mapper
 		tqftpserv
 		"
 	mkdir "$subpkgdir"
diff --git a/device/archived/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware-openrc.post-install b/device/archived/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware-openrc.post-install
index 70b9e0efe..fbdb52e53 100644
--- a/device/archived/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware-openrc.post-install
+++ b/device/archived/device-lenovo-q706f/device-lenovo-q706f-nonfree-firmware-openrc.post-install
@@ -1,3 +1,2 @@
 #!/bin/sh
 rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/archived/device-realme-x3/APKBUILD b/device/archived/device-realme-x3/APKBUILD
index 3c9f3cede..65690e758 100644
--- a/device/archived/device-realme-x3/APKBUILD
+++ b/device/archived/device-realme-x3/APKBUILD
@@ -3,7 +3,7 @@
 maintainer=""
 pkgname=device-realme-x3
 pkgdesc="Realme X3"
-pkgver=5
+pkgver=6
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -47,7 +47,6 @@ nonfree_firmware() {
 	depends="
 		firmware-realme-x3
 		msm-modem
-		pd-mapper
 		tqftpserv
 		bootmac
 		alsa-utils
@@ -62,7 +61,6 @@ nonfree_firmware_openrc() {
 	install="$subpkgname.post-install"
 	depends="
 		openrc
-		pd-mapper-openrc
 		tqftpserv-openrc
 	"
 
diff --git a/device/archived/device-realme-x3/device-realme-x3-nonfree-firmware-openrc.post-install b/device/archived/device-realme-x3/device-realme-x3-nonfree-firmware-openrc.post-install
index 70b9e0efe..fbdb52e53 100644
--- a/device/archived/device-realme-x3/device-realme-x3-nonfree-firmware-openrc.post-install
+++ b/device/archived/device-realme-x3/device-realme-x3-nonfree-firmware-openrc.post-install
@@ -1,3 +1,2 @@
 #!/bin/sh
 rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/archived/device-xiaomi-raphael/APKBUILD b/device/archived/device-xiaomi-raphael/APKBUILD
index 7823682a6..3ca2751e0 100644
--- a/device/archived/device-xiaomi-raphael/APKBUILD
+++ b/device/archived/device-xiaomi-raphael/APKBUILD
@@ -3,7 +3,7 @@
 maintainer=""
 pkgname=device-xiaomi-raphael
 pkgdesc="Xiaomi Mi 9T Pro / Redmi K20 Pro"
-pkgver=7
+pkgver=8
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -55,7 +55,6 @@ nonfree_firmware() {
 		linux-firmware-ath10k
 		linux-firmware-qcom
 		msm-modem
-		pd-mapper
 		tqftpserv
 "
 	mkdir "$subpkgdir"
diff --git a/device/archived/device-xiaomi-raphael/device-xiaomi-raphael-nonfree-firmware-openrc.post-install b/device/archived/device-xiaomi-raphael/device-xiaomi-raphael-nonfree-firmware-openrc.post-install
index 70b9e0efe..fbdb52e53 100644
--- a/device/archived/device-xiaomi-raphael/device-xiaomi-raphael-nonfree-firmware-openrc.post-install
+++ b/device/archived/device-xiaomi-raphael/device-xiaomi-raphael-nonfree-firmware-openrc.post-install
@@ -1,3 +1,2 @@
 #!/bin/sh
 rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/archived/firmware-fxtec-qx1050/APKBUILD b/device/archived/firmware-fxtec-qx1050/APKBUILD
index 6aba3f038..4196e7f3a 100644
--- a/device/archived/firmware-fxtec-qx1050/APKBUILD
+++ b/device/archived/firmware-fxtec-qx1050/APKBUILD
@@ -1,8 +1,8 @@
 # Archived: unmaintained
 maintainer=""
 pkgname=firmware-fxtec-qx1050
-pkgver=1
-pkgrel=4
+pkgver=2
+pkgrel=0
 pkgdesc="Firmware for F(x)tec Pro1x (QX1050)"
 subpackages="
 	$pkgname-adreno
@@ -73,7 +73,6 @@ rproc() {
 	depends="
 		rmtfs
 		tqftpserv
-		pd-mapper
 	"
 	mkdir "$subpkgdir"
 }
@@ -83,7 +82,6 @@ rproc_openrc() {
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	depends="
 		openrc
-		pd-mapper-openrc
 		tqftpserv-openrc
 	"
 	mkdir "$subpkgdir"
diff --git a/device/archived/firmware-fxtec-qx1050/firmware-fxtec-qx1050-rproc-openrc.post-install b/device/archived/firmware-fxtec-qx1050/firmware-fxtec-qx1050-rproc-openrc.post-install
index 71022b0e7..d5a487445 100644
--- a/device/archived/firmware-fxtec-qx1050/firmware-fxtec-qx1050-rproc-openrc.post-install
+++ b/device/archived/firmware-fxtec-qx1050/firmware-fxtec-qx1050-rproc-openrc.post-install
@@ -1,4 +1,3 @@
 #!/bin/sh
 rc-update add rmtfs boot
 rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/archived/soc-qcom-sc8180x/APKBUILD b/device/archived/soc-qcom-sc8180x/APKBUILD
index 80cc7a65c..6a6bc1ae8 100644
--- a/device/archived/soc-qcom-sc8180x/APKBUILD
+++ b/device/archived/soc-qcom-sc8180x/APKBUILD
@@ -2,8 +2,8 @@
 maintainer=""
 pkgname=soc-qcom-sc8180x
 pkgdesc="Common package for Qualcomm 8cx devices"
-pkgver=1
-pkgrel=4
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -22,7 +22,6 @@ nonfree_firmware() {
 	pkgdesc="Modem, WiFi and GPU Firmware"
 	depends="
 		qrtr
-		pd-mapper
 		tqftpserv
 		rmtfs
 	"
@@ -34,7 +33,6 @@ nonfree_firmware_openrc() {
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 	depends="
 		openrc
-		pd-mapper-openrc
 		rmtfs-openrc
 		tqftpserv-openrc
 	"
diff --git a/device/archived/soc-qcom-sc8180x/soc-qcom-sc8180x-nonfree-firmware-openrc.post-install b/device/archived/soc-qcom-sc8180x/soc-qcom-sc8180x-nonfree-firmware-openrc.post-install
index ce8c56ce2..2f45e839e 100644
--- a/device/archived/soc-qcom-sc8180x/soc-qcom-sc8180x-nonfree-firmware-openrc.post-install
+++ b/device/archived/soc-qcom-sc8180x/soc-qcom-sc8180x-nonfree-firmware-openrc.post-install
@@ -2,4 +2,3 @@
 rc-update add qrtr-ns boot
 rc-update add rmtfs boot
 rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/archived/soc-qcom-sm8350/APKBUILD b/device/archived/soc-qcom-sm8350/APKBUILD
index a51ce844b..1a026fd0e 100644
--- a/device/archived/soc-qcom-sm8350/APKBUILD
+++ b/device/archived/soc-qcom-sm8350/APKBUILD
@@ -2,7 +2,7 @@
 maintainer=""
 pkgname=soc-qcom-sm8350
 pkgdesc="Common package for Qualcomm sm8350 devices"
-pkgver=5
+pkgver=6
 pkgrel=2
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -24,13 +24,13 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Modem, WiFi, and GPU Firmware"
-	depends="pd-mapper tqftpserv msm-modem"
+	depends="tqftpserv msm-modem"
 	mkdir -p "$subpkgdir"
 }
 
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"
-	depends="pd-mapper-openrc tqftpserv-openrc"
+	depends="tqftpserv-openrc"
 	mkdir -p "$subpkgdir"
 }
diff --git a/device/archived/soc-qcom-sm8350/soc-qcom-sm8350-nonfree-firmware-openrc.post-install b/device/archived/soc-qcom-sm8350/soc-qcom-sm8350-nonfree-firmware-openrc.post-install
index 70b9e0efe..fbdb52e53 100644
--- a/device/archived/soc-qcom-sm8350/soc-qcom-sm8350-nonfree-firmware-openrc.post-install
+++ b/device/archived/soc-qcom-sm8350/soc-qcom-sm8350-nonfree-firmware-openrc.post-install
@@ -1,3 +1,2 @@
 #!/bin/sh
 rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/community/soc-qcom-sc7180/APKBUILD b/device/community/soc-qcom-sc7180/APKBUILD
index 14af92816..99d0f34af 100644
--- a/device/community/soc-qcom-sc7180/APKBUILD
+++ b/device/community/soc-qcom-sc7180/APKBUILD
@@ -3,7 +3,7 @@
 maintainer="Alicja Michalska <ellyqw@mainlining.org>"
 pkgname=soc-qcom-sc7180
 pkgdesc="Common package for Qualcomm Snapdragon 7cx devices"
-pkgver=3
+pkgver=4
 pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
@@ -41,7 +41,6 @@ openrc() {
 woa() {
 	pkgdesc="Modem, WiFi firmware"
 	depends="
-		pd-mapper
 		tqftpserv
 	"
 	mkdir "$subpkgdir"
@@ -49,7 +48,6 @@ woa() {
 
 woa_openrc() {
 	depends="
-		pd-mapper-openrc
 		tqftpserv-openrc
 	"
 	install_if="$pkgname-woa=$pkgver-r$pkgrel openrc"
diff --git a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-woa-openrc.post-install b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-woa-openrc.post-install
index 70b9e0efe..fbdb52e53 100644
--- a/device/community/soc-qcom-sc7180/soc-qcom-sc7180-woa-openrc.post-install
+++ b/device/community/soc-qcom-sc7180/soc-qcom-sc7180-woa-openrc.post-install
@@ -1,3 +1,2 @@
 #!/bin/sh
 rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/testing/device-hp-elitebook-ultra-g1q/APKBUILD b/device/testing/device-hp-elitebook-ultra-g1q/APKBUILD
index 5edd16fa0..598cdd0f9 100644
--- a/device/testing/device-hp-elitebook-ultra-g1q/APKBUILD
+++ b/device/testing/device-hp-elitebook-ultra-g1q/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="askiiart <mail@askiiart.net>"
 pkgname=device-hp-elitebook-ultra-g1q
 pkgdesc="HP EliteBook Ultra G1q"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -22,7 +22,6 @@ _pmb_recommends="
 	firmware-siliconlabs-rs9116
 	linux-firmware-qca
 	linux-firmware-rtw88
-	pd-mapper
 	rmtfs
 	soc-qcom-qbootctl
 	tqftpserv
diff --git a/device/testing/device-hp-elitebook-ultra-g1q/device-hp-elitebook-ultra-g1q.pre-upgrade b/device/testing/device-hp-elitebook-ultra-g1q/device-hp-elitebook-ultra-g1q.pre-upgrade
index 1cfb7af12..9b218c521 100644
--- a/device/testing/device-hp-elitebook-ultra-g1q/device-hp-elitebook-ultra-g1q.pre-upgrade
+++ b/device/testing/device-hp-elitebook-ultra-g1q/device-hp-elitebook-ultra-g1q.pre-upgrade
@@ -62,7 +62,6 @@ ensure_installed 12-r2 \
 	firmware-brcm43752 \
 	soc-qcom-qbootctl \
 	rmtfs \
-	pd-mapper \
 	tqftpserv \
 	bootmac \
 	woa-firmware-yoinker \
diff --git a/device/testing/device-postmarketos-trailblazer/APKBUILD b/device/testing/device-postmarketos-trailblazer/APKBUILD
index 3ca94554a..a53f49e62 100644
--- a/device/testing/device-postmarketos-trailblazer/APKBUILD
+++ b/device/testing/device-postmarketos-trailblazer/APKBUILD
@@ -3,7 +3,7 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=device-postmarketos-trailblazer
 pkgdesc="postmarketOS Trailblazer generic ARM64"
-pkgver=21
+pkgver=22
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -25,7 +25,6 @@ _pmb_recommends="
 
 	soc-qcom-qbootctl
 	rmtfs
-	pd-mapper
 	tqftpserv
 	bootmac
 	woa-firmware-yoinker
diff --git a/device/testing/device-postmarketos-trailblazer/device-postmarketos-trailblazer.pre-upgrade b/device/testing/device-postmarketos-trailblazer/device-postmarketos-trailblazer.pre-upgrade
index 1cfb7af12..9b218c521 100644
--- a/device/testing/device-postmarketos-trailblazer/device-postmarketos-trailblazer.pre-upgrade
+++ b/device/testing/device-postmarketos-trailblazer/device-postmarketos-trailblazer.pre-upgrade
@@ -62,7 +62,6 @@ ensure_installed 12-r2 \
 	firmware-brcm43752 \
 	soc-qcom-qbootctl \
 	rmtfs \
-	pd-mapper \
 	tqftpserv \
 	bootmac \
 	woa-firmware-yoinker \