diff --git a/device/testing/device-pine64-pinephone/90-modem-eg25.rules b/device/community/device-pine64-pinephone/90-modem-eg25.rules
similarity index 100%
rename from device/testing/device-pine64-pinephone/90-modem-eg25.rules
rename to device/community/device-pine64-pinephone/90-modem-eg25.rules
diff --git a/device/testing/device-pine64-pinephone/APKBUILD b/device/community/device-pine64-pinephone/APKBUILD
similarity index 92%
rename from device/testing/device-pine64-pinephone/APKBUILD
rename to device/community/device-pine64-pinephone/APKBUILD
index 883ed8a07..55fa43dd9 100644
--- a/device/testing/device-pine64-pinephone/APKBUILD
+++ b/device/community/device-pine64-pinephone/APKBUILD
@@ -1,23 +1,22 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Martijn Braam <martijn@brixit.nl>
+# Maintainer: Luca Weiss <luca@z3ntu.xyz>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=device-pine64-pinephone
+pkgver=0.3
+pkgrel=0
 pkgdesc="PINE64 PinePhone"
-pkgver=0.2
-pkgrel=9
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
-depends="postmarketos-base u-boot-pinephone uboot-tools mesa-git-dri-gallium linux-postmarketos-allwinner gpsd atinout bluez"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+depends="postmarketos-base u-boot-pinephone uboot-tools mesa-git-dri-gallium linux-postmarketos-allwinner gpsd atinout"
 makedepends="devicepkg-dev"
 install="$pkgname.post-install"
-source="
-	deviceinfo
+source="deviceinfo
 	uboot-script.cmd
 	sysrq.conf
-	weston.ini
 	hwtest.ini
 	gpsd_pinephone.initd
 	gpsd_device-hook.sh
@@ -79,7 +78,6 @@ nonfree_firmware() {
 sha512sums="d652289aee7c54e2785136fbcd360e5909d80b0940758771cdb8f01504f397ed36a38e5015e947007b84bc58b29fd0f67dc7b886facfe47e15d694bf54617d7e  deviceinfo
 8a7c4f2ee8ce946c611e5023a1d23f5e1898faee02c2171ce03b2ce0e83a6d79cd4301f80e404ae62fb7e7db7b6bbb2b5e0e0480b396532e941db37300feee1e  uboot-script.cmd
 f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8e4042bb83cc80b2b436224c8d47b6d67361369a724bbf7ee  sysrq.conf
-c4c57d1627dd451213e1ef20d89de9266cd4edcc2d33a69aa9a1f13e16d9f9742036b69dc149fd910d7213f7525c41eb79576d4457bc85cc96eba0d986382d27  weston.ini
 3dd6d612c381cb0002049d1974d8fb5aa5a53a1eb4d6bcbf62eb2ad52cfdc45f0f6ad24a699716d3513b0371aa1316f25dc72afc10d7176cc3b99d0965c3f030  hwtest.ini
 1017fc3f325227da58c77abdc59e9735288d91a7ccc63ec784fe0241c523786b617a11ce8045dab2a74ca12a7dd70aaa334af91836418db1e96a3266fecaa4fd  gpsd_pinephone.initd
 ccbc83b84b5028bc2c8e526759004ce71b50b2675ecffee98f5676c70a3332197a231ff9d2fd46444dd3c0a637ec08ce6125b18240fe6bfc13f624a15192e648  gpsd_device-hook.sh
diff --git a/device/testing/device-pine64-pinephone/device-pine64-pinephone.post-install b/device/community/device-pine64-pinephone/device-pine64-pinephone.post-install
similarity index 58%
rename from device/testing/device-pine64-pinephone/device-pine64-pinephone.post-install
rename to device/community/device-pine64-pinephone/device-pine64-pinephone.post-install
index 352da4513..473441fbf 100644
--- a/device/testing/device-pine64-pinephone/device-pine64-pinephone.post-install
+++ b/device/community/device-pine64-pinephone/device-pine64-pinephone.post-install
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-sed -i 's|#Name = BlueZ|Name = PINE64 PinePhone|' /etc/bluetooth/main.conf
-
-rc-update add bluetooth default
 rc-update add eg25 default
 rc-update add gpsd default
 rc-update add gpsd_pinephone default
diff --git a/device/testing/device-pine64-pinephone/deviceinfo b/device/community/device-pine64-pinephone/deviceinfo
similarity index 100%
rename from device/testing/device-pine64-pinephone/deviceinfo
rename to device/community/device-pine64-pinephone/deviceinfo
diff --git a/device/testing/device-pine64-pinephone/eg25.initd b/device/community/device-pine64-pinephone/eg25.initd
similarity index 100%
rename from device/testing/device-pine64-pinephone/eg25.initd
rename to device/community/device-pine64-pinephone/eg25.initd
diff --git a/device/testing/device-pine64-pinephone/gpsd_device-hook.sh b/device/community/device-pine64-pinephone/gpsd_device-hook.sh
similarity index 100%
rename from device/testing/device-pine64-pinephone/gpsd_device-hook.sh
rename to device/community/device-pine64-pinephone/gpsd_device-hook.sh
diff --git a/device/testing/device-pine64-pinephone/gpsd_pinephone.initd b/device/community/device-pine64-pinephone/gpsd_pinephone.initd
similarity index 100%
rename from device/testing/device-pine64-pinephone/gpsd_pinephone.initd
rename to device/community/device-pine64-pinephone/gpsd_pinephone.initd
diff --git a/device/testing/device-pine64-pinephone/hwtest.ini b/device/community/device-pine64-pinephone/hwtest.ini
similarity index 100%
rename from device/testing/device-pine64-pinephone/hwtest.ini
rename to device/community/device-pine64-pinephone/hwtest.ini
diff --git a/device/testing/device-pine64-pinephone/setup-modem-audio.initd b/device/community/device-pine64-pinephone/setup-modem-audio.initd
similarity index 100%
rename from device/testing/device-pine64-pinephone/setup-modem-audio.initd
rename to device/community/device-pine64-pinephone/setup-modem-audio.initd
diff --git a/device/testing/device-pine64-pinephone/setup-modem-audio.sh b/device/community/device-pine64-pinephone/setup-modem-audio.sh
similarity index 100%
rename from device/testing/device-pine64-pinephone/setup-modem-audio.sh
rename to device/community/device-pine64-pinephone/setup-modem-audio.sh
diff --git a/device/testing/device-pine64-pinephone/sysrq.conf b/device/community/device-pine64-pinephone/sysrq.conf
similarity index 100%
rename from device/testing/device-pine64-pinephone/sysrq.conf
rename to device/community/device-pine64-pinephone/sysrq.conf
diff --git a/device/testing/device-pine64-pinephone/uboot-script.cmd b/device/community/device-pine64-pinephone/uboot-script.cmd
similarity index 100%
rename from device/testing/device-pine64-pinephone/uboot-script.cmd
rename to device/community/device-pine64-pinephone/uboot-script.cmd
diff --git a/device/testing/device-pine64-pinephone/ucm/HiFi.conf b/device/community/device-pine64-pinephone/ucm/HiFi.conf
similarity index 100%
rename from device/testing/device-pine64-pinephone/ucm/HiFi.conf
rename to device/community/device-pine64-pinephone/ucm/HiFi.conf
diff --git a/device/testing/device-pine64-pinephone/ucm/VoiceCall.conf b/device/community/device-pine64-pinephone/ucm/VoiceCall.conf
similarity index 100%
rename from device/testing/device-pine64-pinephone/ucm/VoiceCall.conf
rename to device/community/device-pine64-pinephone/ucm/VoiceCall.conf
diff --git a/device/testing/device-pine64-pinephone/ucm/sun50i-a64-audio.conf b/device/community/device-pine64-pinephone/ucm/sun50i-a64-audio.conf
similarity index 100%
rename from device/testing/device-pine64-pinephone/ucm/sun50i-a64-audio.conf
rename to device/community/device-pine64-pinephone/ucm/sun50i-a64-audio.conf
diff --git a/device/testing/device-pine64-pinephone/weston.ini b/device/testing/device-pine64-pinephone/weston.ini
deleted file mode 100644
index 2266916b6..000000000
--- a/device/testing/device-pine64-pinephone/weston.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-# XWayland seems to be broken for this device.
-# NOTE: This information might be outdated! simply delete /etc/xdg/weston/weston.ini
-# after installation to check if it is still broken, and please report if it
-# isn't broken anymore (or even better: make a pull request, that removes this
-# config file).
-
-[core]
-xwayland=true
-backend=fbdev-backend.so
-
-[shell]
-background-image=/usr/share/wallpapers/postmarketos.jpg
diff --git a/device/testing/device-pine64-pinephone/xorg.conf b/device/testing/device-pine64-pinephone/xorg.conf
deleted file mode 100644
index b7374dc41..000000000
--- a/device/testing/device-pine64-pinephone/xorg.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-Section "ServerLayout"
-  Identifier "Layout0"
-  Screen "Screen0"
-EndSection
-
-Section "Device"
-  Identifier "Card0"
-  Driver "fbdev"
-  Option "fbdev" "/dev/fb0" #linuxdeploy
-EndSection
-
-Section "Screen"
-  Identifier "Screen0"
-  Device "Card0"
-  DefaultDepth 24
-  SubSection "Display"
-    Depth 32
-  EndSubSection
-EndSection
-
-Section "ServerFlags"
-  Option "Pixmap" "24"
-EndSection
-