diff --git a/device/testing/device-google-bonito/90-feedbackd-drv2624.rules b/device/community/device-google-bonito/90-feedbackd-drv2624.rules
similarity index 100%
rename from device/testing/device-google-bonito/90-feedbackd-drv2624.rules
rename to device/community/device-google-bonito/90-feedbackd-drv2624.rules
diff --git a/device/testing/device-google-bonito/APKBUILD b/device/community/device-google-bonito/APKBUILD
similarity index 97%
rename from device/testing/device-google-bonito/APKBUILD
rename to device/community/device-google-bonito/APKBUILD
index 1b2cb4804..8689c1cd5 100644
--- a/device/testing/device-google-bonito/APKBUILD
+++ b/device/community/device-google-bonito/APKBUILD
@@ -1,8 +1,9 @@
 # Reference: <https://postmarketos.org/devicepkg>
+# Maintainer: Anjandev Momi <anjan@momi.ca>
 pkgname=device-google-bonito
 pkgdesc="Google Pixel 3a XL"
 pkgver=4
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
diff --git a/device/testing/device-google-bonito/deviceinfo b/device/community/device-google-bonito/deviceinfo
similarity index 100%
rename from device/testing/device-google-bonito/deviceinfo
rename to device/community/device-google-bonito/deviceinfo
diff --git a/device/testing/device-google-bonito/modules-initfs b/device/community/device-google-bonito/modules-initfs
similarity index 100%
rename from device/testing/device-google-bonito/modules-initfs
rename to device/community/device-google-bonito/modules-initfs
diff --git a/device/testing/device-google-bonito/q6voiced.conf b/device/community/device-google-bonito/q6voiced.conf
similarity index 100%
rename from device/testing/device-google-bonito/q6voiced.conf
rename to device/community/device-google-bonito/q6voiced.conf