diff --git a/device/testing/device-fairphone-fp4/90-feedbackd-aw8695.rules b/device/community/device-fairphone-fp4/90-feedbackd-aw8695.rules
similarity index 100%
rename from device/testing/device-fairphone-fp4/90-feedbackd-aw8695.rules
rename to device/community/device-fairphone-fp4/90-feedbackd-aw8695.rules
diff --git a/device/testing/device-fairphone-fp4/APKBUILD b/device/community/device-fairphone-fp4/APKBUILD
similarity index 97%
rename from device/testing/device-fairphone-fp4/APKBUILD
rename to device/community/device-fairphone-fp4/APKBUILD
index 296000f2c..d0ce84558 100644
--- a/device/testing/device-fairphone-fp4/APKBUILD
+++ b/device/community/device-fairphone-fp4/APKBUILD
@@ -1,8 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Luca Weiss <luca@z3ntu.xyz>
 pkgname=device-fairphone-fp4
 pkgdesc="Fairphone 4"
 pkgver=0.8
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
diff --git a/device/testing/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install b/device/community/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install
similarity index 100%
rename from device/testing/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install
rename to device/community/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install
diff --git a/device/testing/device-fairphone-fp4/deviceinfo b/device/community/device-fairphone-fp4/deviceinfo
similarity index 100%
rename from device/testing/device-fairphone-fp4/deviceinfo
rename to device/community/device-fairphone-fp4/deviceinfo
diff --git a/device/testing/device-fairphone-fp4/gtk.css b/device/community/device-fairphone-fp4/gtk.css
similarity index 100%
rename from device/testing/device-fairphone-fp4/gtk.css
rename to device/community/device-fairphone-fp4/gtk.css
diff --git a/device/testing/device-fairphone-fp4/phoc.ini b/device/community/device-fairphone-fp4/phoc.ini
similarity index 100%
rename from device/testing/device-fairphone-fp4/phoc.ini
rename to device/community/device-fairphone-fp4/phoc.ini
diff --git a/device/testing/linux-postmarketos-qcom-sm6350/APKBUILD b/device/community/linux-postmarketos-qcom-sm6350/APKBUILD
similarity index 100%
rename from device/testing/linux-postmarketos-qcom-sm6350/APKBUILD
rename to device/community/linux-postmarketos-qcom-sm6350/APKBUILD
diff --git a/device/testing/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64 b/device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64
similarity index 100%
rename from device/testing/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64
rename to device/community/linux-postmarketos-qcom-sm6350/config-postmarketos-qcom-sm6350.aarch64