diff --git a/device/testing/device-samsung-fortuna3g/APKBUILD b/device/testing/device-samsung-fortuna3g/APKBUILD
index 9b8dd0ed9..ebadcaca3 100644
--- a/device/testing/device-samsung-fortuna3g/APKBUILD
+++ b/device/testing/device-samsung-fortuna3g/APKBUILD
@@ -1,8 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
-
 pkgname=device-samsung-fortuna3g
 pkgdesc="Samsung Galaxy Grand Prime 3G (G530H)"
-pkgver=2
+pkgver=2.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -12,10 +11,7 @@ depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-phosh
-"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 _pmb_select="soc-qcom-msm8916-rproc"
 
 build() {
@@ -32,12 +28,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
-	depends="device-samsung-gprimeltexx-phosh"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 da040e9efd722168e547fc80f05b527a412b46db0d41e6f1ee340a224b4661de46e2639c1054b40e2d28776124a39d0c60eb74ab5149b576869d51aea1c009d1  deviceinfo
 02b6d383149ba2ec3a31b206767be7ead31d9f0e7ee5cab11047000c53ccad387a118cbddb06093bca5cae3e82f884c02194de47b8e7a9c76102ac46506bb111  modules-initfs
diff --git a/device/testing/device-samsung-fortunaltezt/APKBUILD b/device/testing/device-samsung-fortunaltezt/APKBUILD
index 2ed9843a7..3fac3b5dc 100644
--- a/device/testing/device-samsung-fortunaltezt/APKBUILD
+++ b/device/testing/device-samsung-fortunaltezt/APKBUILD
@@ -1,8 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-samsung-fortunaltezt
 pkgdesc="Samsung Galaxy Grand Prime (SM-G530Y)"
-pkgver=1.3
-pkgrel=2
+pkgver=1.4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -18,12 +18,8 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	modules-initfs
-	phoc.ini
-"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-phosh
 "
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 _pmb_select="soc-qcom-msm8916-rproc"
 
 build() {
@@ -40,14 +36,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
-}
-
 sha512sums="
 086cddd57c4a0de9ff2b7381342509a4916dab726dcc43132f4213ee67eb6dd176b895641f8e454fe513b1f1fc71d53a73d1936a45e02df20930e0f024c83af7  deviceinfo
 0dcec6521708a8733aab879eb65047d3bf0ab562d4afb40fec2cff057a08b52b59940e1f9dea2f32519b2565af0399f724950c631ee45790a73199eb53c0653f  modules-initfs
-dbc8422fc00c757963dd016f26dd45d8c05c8c46b7e60cd11dd154550e166568cfdcee60678ee3542d27c2f8c373b71a1c3ec33da0260509fe4133ecd06a27bc  phoc.ini
 "
diff --git a/device/testing/device-samsung-fortunaltezt/phoc.ini b/device/testing/device-samsung-fortunaltezt/phoc.ini
deleted file mode 100644
index 21546afe3..000000000
--- a/device/testing/device-samsung-fortunaltezt/phoc.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[output:DSI-1]
-scale = 1.5
diff --git a/device/testing/device-samsung-gprimeltecan/APKBUILD b/device/testing/device-samsung-gprimeltecan/APKBUILD
index 65ce855b6..dcb87fa7f 100644
--- a/device/testing/device-samsung-gprimeltecan/APKBUILD
+++ b/device/testing/device-samsung-gprimeltecan/APKBUILD
@@ -1,8 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
-
 pkgname=device-samsung-gprimeltecan
 pkgdesc="Samsung Galaxy Grand Prime CAN (G530W)"
-pkgver=2
+pkgver=2.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -12,10 +11,7 @@ depends="postmarketos-base mkbootimg linux-postmarketos-qcom-msm8916
 	 soc-qcom-msm8916 soc-qcom-msm8916-rproc"
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-phosh
-"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 _pmb_select="soc-qcom-msm8916-rproc"
 
 build() {
@@ -32,12 +28,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
-	depends="device-samsung-gprimeltexx-phosh"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 2056e5860b178410c1b6160ae35e57b08d248255cd2a80739e253a93a9f6418e2ac6d5d50287aa06e3b67cae5ee686cea92f8c6cd4bef48364684e820aac8e12  deviceinfo
 02b6d383149ba2ec3a31b206767be7ead31d9f0e7ee5cab11047000c53ccad387a118cbddb06093bca5cae3e82f884c02194de47b8e7a9c76102ac46506bb111  modules-initfs
diff --git a/device/testing/device-samsung-gprimeltexx/APKBUILD b/device/testing/device-samsung-gprimeltexx/APKBUILD
index 0f15ed3d7..0526a815a 100644
--- a/device/testing/device-samsung-gprimeltexx/APKBUILD
+++ b/device/testing/device-samsung-gprimeltexx/APKBUILD
@@ -1,8 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
-
 pkgname=device-samsung-gprimeltexx
 pkgdesc="Samsung Galaxy Grand Prime (G530FZ)"
-pkgver=2
+pkgver=2.1
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -14,12 +13,8 @@ makedepends="devicepkg-dev"
 source="
 	deviceinfo
 	modules-initfs
-	phoc.ini
-"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-phosh
 "
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 _pmb_select="soc-qcom-msm8916-rproc"
 
 
@@ -37,14 +32,7 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-phosh() {
-	install_if="$pkgname postmarketos-ui-phosh"
-	install -Dm644 "$srcdir"/phoc.ini \
-		"$subpkgdir"/etc/phosh/phoc.ini
-}
-
 sha512sums="
 036e06b40e7bdc505caf2f395b1100d9fdc978176bf6297ca1a89b6aea7f75e7ef2a88a41c6c6634aa67d9c82a0235ac503583637f40266b12f87a81732d7400  deviceinfo
 02b6d383149ba2ec3a31b206767be7ead31d9f0e7ee5cab11047000c53ccad387a118cbddb06093bca5cae3e82f884c02194de47b8e7a9c76102ac46506bb111  modules-initfs
-dbc8422fc00c757963dd016f26dd45d8c05c8c46b7e60cd11dd154550e166568cfdcee60678ee3542d27c2f8c373b71a1c3ec33da0260509fe4133ecd06a27bc  phoc.ini
 "
diff --git a/device/testing/device-samsung-gprimeltexx/phoc.ini b/device/testing/device-samsung-gprimeltexx/phoc.ini
deleted file mode 100644
index 21546afe3..000000000
--- a/device/testing/device-samsung-gprimeltexx/phoc.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[output:DSI-1]
-scale = 1.5