diff --git a/main/postmarketos-ui-sxmo-de-dwm/APKBUILD b/main/postmarketos-ui-sxmo-de-dwm/APKBUILD
index 357d3a62a..8b08251a8 100644
--- a/main/postmarketos-ui-sxmo-de-dwm/APKBUILD
+++ b/main/postmarketos-ui-sxmo-de-dwm/APKBUILD
@@ -5,20 +5,20 @@
 maintainer="Willow Barraco <contact@willowbarraco.fr>"
 pkgname=postmarketos-ui-sxmo-de-dwm
 pkgver=1.18.0 # Bump this so the file names in bpo are correct
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on dwm"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch"
 license="AGPL-3.0-only"
 depends="
-	mmsd-tng
-	modemmanager
 	postmarketos-base-ui
 	postmarketos-base-ui-audio
 	postmarketos-base-ui-networkmanager
 	sxmo-utils-audio-bluetooth
 	sxmo-utils-dwm
-	vvmd
+	sxmo-utils-modem
+	sxmo-utils-modem-mms
+	sxmo-utils-modem-vvm
 	"
 install="
 	$pkgname.post-install
diff --git a/main/postmarketos-ui-sxmo-de-river/APKBUILD b/main/postmarketos-ui-sxmo-de-river/APKBUILD
index ffc909ae7..9d6899940 100644
--- a/main/postmarketos-ui-sxmo-de-river/APKBUILD
+++ b/main/postmarketos-ui-sxmo-de-river/APKBUILD
@@ -5,21 +5,21 @@
 maintainer="Willow Barraco <contact@willowbarraco.fr>"
 pkgname=postmarketos-ui-sxmo-de-river
 pkgver=1.18.0 # Bump this so the file names in bpo are correct
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on river"
 url="http://sr.ht/~mil/Sxmo"
 # zig and river are only available for these arches
 arch="aarch64 x86_64"
 license="AGPL-3.0-only"
 depends="
-	mmsd-tng
-	modemmanager
 	postmarketos-base-ui
 	postmarketos-base-ui-audio
 	postmarketos-base-ui-networkmanager
 	sxmo-utils-audio-bluetooth
+	sxmo-utils-modem
+	sxmo-utils-modem-mms
+	sxmo-utils-modem-vvm
 	sxmo-utils-river
-	vvmd
 	"
 install="
 	$pkgname.post-install
diff --git a/main/postmarketos-ui-sxmo-de-sway/APKBUILD b/main/postmarketos-ui-sxmo-de-sway/APKBUILD
index 155aa2d3a..785b9d756 100644
--- a/main/postmarketos-ui-sxmo-de-sway/APKBUILD
+++ b/main/postmarketos-ui-sxmo-de-sway/APKBUILD
@@ -5,20 +5,20 @@
 maintainer="Willow Barraco <contact@willowbarraco.fr>"
 pkgname=postmarketos-ui-sxmo-de-sway
 pkgver=1.18.0 # Bump this so the file names in bpo are correct
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple Mobile: Mobile environment based on SXMO and running on sway"
 url="http://sr.ht/~mil/Sxmo"
 arch="noarch"
 license="AGPL-3.0-only"
 depends="
-	mmsd-tng
-	modemmanager
 	postmarketos-base-ui
 	postmarketos-base-ui-audio
 	postmarketos-base-ui-networkmanager
 	sxmo-utils-audio-bluetooth
+	sxmo-utils-modem
+	sxmo-utils-modem-mms
+	sxmo-utils-modem-vvm
 	sxmo-utils-sway
-	vvmd
 	"
 install="
 	$pkgname.post-install