diff --git a/device/testing/device-samsung-espresso3g/APKBUILD b/device/community/device-samsung-espresso3g/APKBUILD
similarity index 72%
rename from device/testing/device-samsung-espresso3g/APKBUILD
rename to device/community/device-samsung-espresso3g/APKBUILD
index bf164b693..723d0f83e 100644
--- a/device/testing/device-samsung-espresso3g/APKBUILD
+++ b/device/community/device-samsung-espresso3g/APKBUILD
@@ -4,14 +4,14 @@
 pkgname=device-samsung-espresso3g
 pkgdesc="Samsung Galaxy Tab 2 3g (7.0 inch)"
 pkgver=0.1
-pkgrel=1
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-samsung-espresso3g mkbootimg"
 makedepends="devicepkg-dev"
-source="deviceinfo"
+source="deviceinfo phoc.ini"
 subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 
 build() {
@@ -28,6 +28,13 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
+phosh() {
+	install_if="$pkgname postmarketos-ui-phosh"
+	install -Dm644 "$srcdir"/phosh.ini \
+			"$subpkgdir"/usr/share/phosh/phoc.ini
+}
+
 sha512sums="
 9fa446ae99b5d22bb211cb455ef78d0567463650e0a85beb9125f4bc56531b74d1690304770afa7886f26852b81f668d36add71fa3f7b840d0650e8b5483257a  deviceinfo
+1754d066d34919e25cf632a0a58b4c0f7a5cea46ea7c3534175cca3c0afaffd7e3128d0191a9db44ef47ab1a4f702f287bbc6160b131d924ebd8c4450e62d39c  phoc.ini
 "
diff --git a/device/testing/device-samsung-espresso3g/deviceinfo b/device/community/device-samsung-espresso3g/deviceinfo
similarity index 100%
rename from device/testing/device-samsung-espresso3g/deviceinfo
rename to device/community/device-samsung-espresso3g/deviceinfo
diff --git a/device/community/device-samsung-espresso3g/phoc.ini b/device/community/device-samsung-espresso3g/phoc.ini
new file mode 100644
index 000000000..d80c83f73
--- /dev/null
+++ b/device/community/device-samsung-espresso3g/phoc.ini
@@ -0,0 +1,29 @@
+#[core]
+#xwayland=false
+
+[output:LVDS-1]
+scale = 0.75
+
+[output:DSI-1]
+scale = 2
+
+[output:Virtual-1]
+# For the x86 VM using QXL to get a phone like geometry
+modeline = 87.25  720 776 848 976  1440 1443 1453 1493 -hsync +vsync
+mode = 720x1440
+scale = 2
+
+[output:X11-1]
+mode = 360x720
+#rotate = 90
+scale = 1
+
+[output:WL-1]
+mode = 360x720
+#rotate = 90
+scale = 1
+
+[output:HEADLESS-1]
+mode = 720x1440
+#rotate = 90
+scale = 2
diff --git a/device/testing/firmware-samsung-espresso3g/APKBUILD b/device/community/firmware-samsung-espresso3g/APKBUILD
similarity index 100%
rename from device/testing/firmware-samsung-espresso3g/APKBUILD
rename to device/community/firmware-samsung-espresso3g/APKBUILD
diff --git a/device/testing/linux-samsung-espresso3g/00-add-espresso-dts.patch b/device/community/linux-samsung-espresso3g/00-add-espresso-dts.patch
similarity index 100%
rename from device/testing/linux-samsung-espresso3g/00-add-espresso-dts.patch
rename to device/community/linux-samsung-espresso3g/00-add-espresso-dts.patch
diff --git a/device/testing/linux-samsung-espresso3g/APKBUILD b/device/community/linux-samsung-espresso3g/APKBUILD
similarity index 94%
rename from device/testing/linux-samsung-espresso3g/APKBUILD
rename to device/community/linux-samsung-espresso3g/APKBUILD
index 356c9bb0d..3f0c46ec0 100644
--- a/device/testing/linux-samsung-espresso3g/APKBUILD
+++ b/device/community/linux-samsung-espresso3g/APKBUILD
@@ -1,6 +1,8 @@
+# Maintainer: Mighty <mightymb17@gmail.com>
+# Co-Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=linux-samsung-espresso3g
 pkgver=5.15_rc1
-pkgrel=1
+pkgrel=0
 pkgdesc="Samsung Galaxy Tab 2 (7.0 inch) mainline kernel"
 arch="armv7"
 _carch="arm"
diff --git a/device/testing/linux-samsung-espresso3g/config-samsung-espresso3g.armv7 b/device/community/linux-samsung-espresso3g/config-samsung-espresso3g.armv7
similarity index 100%
rename from device/testing/linux-samsung-espresso3g/config-samsung-espresso3g.armv7
rename to device/community/linux-samsung-espresso3g/config-samsung-espresso3g.armv7