diff --git a/device/community/device-samsung-espresso10/APKBUILD b/device/community/device-samsung-espresso10/APKBUILD
index c7e987def..109bc5ebd 100644
--- a/device/community/device-samsung-espresso10/APKBUILD
+++ b/device/community/device-samsung-espresso10/APKBUILD
@@ -28,5 +28,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-71cfa96be567b907fe8f4af4d20deb5a67ab2d10eaa7ed9a46e3787176ca65071f48aa9cd3092f6944c7e382fb1da4ec2e843f9c68f53833fc46943bf07051d7  deviceinfo
+e0f270451abf1d3b67dad9f7a46cd399e08c74c52ac152dfffde46ec3151ef44982302d53e58dc48fd24e5a01f5796d36fc22a85d182bc0df8eaf3f880025579  deviceinfo
 "
diff --git a/device/community/device-samsung-espresso10/deviceinfo b/device/community/device-samsung-espresso10/deviceinfo
index ac8057179..c96191df6 100644
--- a/device/community/device-samsung-espresso10/deviceinfo
+++ b/device/community/device-samsung-espresso10/deviceinfo
@@ -30,4 +30,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_heimdall_partition_system="FACTORYFS"
-deviceinfo_flash_heimdall_partition_dtbo="dtbo"
diff --git a/device/community/device-samsung-espresso7/APKBUILD b/device/community/device-samsung-espresso7/APKBUILD
index 6b1478858..222eaeb97 100644
--- a/device/community/device-samsung-espresso7/APKBUILD
+++ b/device/community/device-samsung-espresso7/APKBUILD
@@ -13,6 +13,8 @@ depends="postmarketos-base postmarketos-update-kernel linux-postmarketos-omap mk
 makedepends="devicepkg-dev"
 source="deviceinfo"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+replaces="device-samsung-espresso3g"
+provides="device-samsung-espresso3g=$pkgver-r$pkgrel"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -29,5 +31,5 @@ nonfree_firmware() {
 }
 
 sha512sums="
-cef1245a846cf5279661fe22e13e5ba88711c5b4c7dffc7e3d7273ef9c319a424467c2ec6e989b3f0304df48da38786fd0ed4ec498cbd098d1498b0dad9b5621  deviceinfo
+103fe306c0bf2c55a45256946dcd77356dc926abc854f40c11bf9a691f21c09148b7213bbe163666755f028164d31f070d677fc8197cb1dc2332afc6afb51b60  deviceinfo
 "
diff --git a/device/community/device-samsung-espresso7/deviceinfo b/device/community/device-samsung-espresso7/deviceinfo
index 4cd8b035d..bc80a8462 100644
--- a/device/community/device-samsung-espresso7/deviceinfo
+++ b/device/community/device-samsung-espresso7/deviceinfo
@@ -30,4 +30,3 @@ deviceinfo_flash_offset_second="0x00f00000"
 deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="2048"
 deviceinfo_flash_heimdall_partition_system="FACTORYFS"
-deviceinfo_flash_heimdall_partition_dtbo="dtbo"