diff --git a/device/archived/soc-qcom-msm8998/APKBUILD b/device/archived/soc-qcom-msm8998/APKBUILD
index f86322187..f1b38b352 100644
--- a/device/archived/soc-qcom-msm8998/APKBUILD
+++ b/device/archived/soc-qcom-msm8998/APKBUILD
@@ -2,15 +2,14 @@
 maintainer=""
 pkgname=soc-qcom-msm8998
 pkgdesc="Common package for Qualcomm MSM8998 devices"
-pkgver=1
-pkgrel=5
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
 options="!check !archcheck !tracedeps"
 depends="
 	soc-qcom
-	soc-qcom-pd-mapper
 "
 source="iwd-main.conf"
 subpackages="
diff --git a/device/community/device-google-bonito/APKBUILD b/device/community/device-google-bonito/APKBUILD
index 7738a8e91..e8d03fd4c 100644
--- a/device/community/device-google-bonito/APKBUILD
+++ b/device/community/device-google-bonito/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Anjandev Momi <anjan@momi.ca>"
 pkgname=device-google-bonito
 pkgdesc="Google Pixel 3a XL"
-pkgver=11
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -20,7 +20,6 @@ depends="
 	postmarketos-base
 	soc-qcom
 	soc-qcom-modem
-	soc-qcom-pd-mapper
 	soc-qcom-qbootctl
 	systemd-boot
 	unl0kr-fbforcerefresh
diff --git a/device/community/device-google-sargo/APKBUILD b/device/community/device-google-sargo/APKBUILD
index dbf053fe1..37c907a1d 100644
--- a/device/community/device-google-sargo/APKBUILD
+++ b/device/community/device-google-sargo/APKBUILD
@@ -3,7 +3,7 @@
 maintainer="Richard Acayan <mailingradian@gmail.com>"
 pkgname=device-google-sargo
 pkgdesc="Google Pixel 3a"
-pkgver=20
+pkgver=21
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -22,7 +22,6 @@ depends="
 	postmarketos-base
 	soc-qcom
 	soc-qcom-modem
-	soc-qcom-pd-mapper
 	soc-qcom-qbootctl
 	systemd-boot
 	unl0kr-fbforcerefresh
diff --git a/device/testing/device-ayn-odin/APKBUILD b/device/testing/device-ayn-odin/APKBUILD
index 1000a076e..b31a9dfc6 100644
--- a/device/testing/device-ayn-odin/APKBUILD
+++ b/device/testing/device-ayn-odin/APKBUILD
@@ -2,8 +2,8 @@
 maintainer="Stefan Hansson <newbyte@postmarketos.org>"
 pkgname=device-ayn-odin
 pkgdesc="AYN Odin"
-pkgver=8
-pkgrel=1
+pkgver=9
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -18,7 +18,6 @@ depends="
 	alsa-ucm-conf-sdm845
 	rmtfs
 	soc-qcom
-	soc-qcom-pd-mapper
 	soc-qcom-qbootctl
 	systemd-boot
 "
diff --git a/device/testing/device-fairphone-fp5/APKBUILD b/device/testing/device-fairphone-fp5/APKBUILD
index 7227fde26..e22037328 100644
--- a/device/testing/device-fairphone-fp5/APKBUILD
+++ b/device/testing/device-fairphone-fp5/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Luca Weiss <luca@lucaweiss.eu>"
 pkgname=device-fairphone-fp5
 pkgdesc="Fairphone 5"
-pkgver=17
+pkgver=18
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -29,7 +29,6 @@ depends="
 	postmarketos-base
 	soc-qcom
 	soc-qcom-modem
-	soc-qcom-pd-mapper
 	soc-qcom-qbootctl
 	systemd-boot
 	unl0kr-fbforcerefresh
diff --git a/device/testing/device-nothing-spacewar/APKBUILD b/device/testing/device-nothing-spacewar/APKBUILD
index fb4f7e019..05c3ce9c9 100644
--- a/device/testing/device-nothing-spacewar/APKBUILD
+++ b/device/testing/device-nothing-spacewar/APKBUILD
@@ -5,8 +5,8 @@
 maintainer="Danila Tikhonov <danila@mainlining.org>"
 pkgname=device-nothing-spacewar
 pkgdesc="Nothing Phone (1)"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -25,7 +25,6 @@ depends="
 	postmarketos-base
 	soc-qcom
 	soc-qcom-modem
-	soc-qcom-pd-mapper
 	soc-qcom-qbootctl
 	systemd-boot
 	unl0kr-fbforcerefresh
diff --git a/device/testing/device-shift-otter/APKBUILD b/device/testing/device-shift-otter/APKBUILD
index 2a7ef42e4..f7339b90a 100644
--- a/device/testing/device-shift-otter/APKBUILD
+++ b/device/testing/device-shift-otter/APKBUILD
@@ -3,7 +3,7 @@
 maintainer="Casey Connolly <kcxt@postmarketos.org>"
 pkgname=device-shift-otter
 pkgdesc="SHIFTphone 8"
-pkgver=4
+pkgver=5
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -19,7 +19,6 @@ depends="
 	postmarketos-base
 	soc-qcom
 	soc-qcom-modem
-	soc-qcom-pd-mapper
 	soc-qcom-qbootctl
 	unl0kr-fbforcerefresh
 "
diff --git a/device/testing/device-xiaomi-pyxis/APKBUILD b/device/testing/device-xiaomi-pyxis/APKBUILD
index 280e0b863..3dcee04c4 100644
--- a/device/testing/device-xiaomi-pyxis/APKBUILD
+++ b/device/testing/device-xiaomi-pyxis/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Alicja Michalska <ellyqw@mainlining.org>"
 pkgname=device-xiaomi-pyxis
 pkgdesc="Xiaomi Mi 9 Lite"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -21,7 +21,6 @@ depends="
 	postmarketos-base
 	soc-qcom
 	soc-qcom-modem
-	soc-qcom-pd-mapper
 	soc-qcom-qbootctl
 	systemd-boot
 	unl0kr-fbforcerefresh
diff --git a/device/testing/device-xiaomi-vayu/APKBUILD b/device/testing/device-xiaomi-vayu/APKBUILD
index b009f2768..fb7f4e526 100644
--- a/device/testing/device-xiaomi-vayu/APKBUILD
+++ b/device/testing/device-xiaomi-vayu/APKBUILD
@@ -2,7 +2,7 @@
 maintainer="Ali Nasrullayev <nesrullayev.ali@gmail.com>"
 pkgname=device-xiaomi-vayu
 pkgdesc="Xiaomi POCO X3 Pro"
-pkgver=6
+pkgver=7
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -18,7 +18,6 @@ depends="
 	postmarketos-base
 	soc-qcom
 	soc-qcom-modem
-	soc-qcom-pd-mapper
 	soc-qcom-qbootctl
 "
 makedepends="devicepkg-dev"