diff --git a/device/testing/device-qemu-aarch64/APKBUILD b/device/main/device-qemu-aarch64/APKBUILD
similarity index 93%
rename from device/testing/device-qemu-aarch64/APKBUILD
rename to device/main/device-qemu-aarch64/APKBUILD
index 3923d416d..36d120ae0 100644
--- a/device/testing/device-qemu-aarch64/APKBUILD
+++ b/device/main/device-qemu-aarch64/APKBUILD
@@ -1,6 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
 # Contributor: Minecrell <minecrell@minecrell.net>
+# Maintainer: Minecrell <minecrell@minecrell.net>
+# Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-qemu-aarch64
 pkgver=2
 pkgrel=0
diff --git a/device/testing/device-qemu-aarch64/device-qemu-aarch64-xfce4.post-install b/device/main/device-qemu-aarch64/device-qemu-aarch64-xfce4.post-install
similarity index 100%
rename from device/testing/device-qemu-aarch64/device-qemu-aarch64-xfce4.post-install
rename to device/main/device-qemu-aarch64/device-qemu-aarch64-xfce4.post-install
diff --git a/device/testing/device-qemu-aarch64/deviceinfo b/device/main/device-qemu-aarch64/deviceinfo
similarity index 100%
rename from device/testing/device-qemu-aarch64/deviceinfo
rename to device/main/device-qemu-aarch64/deviceinfo
diff --git a/device/testing/device-qemu-aarch64/weston.ini b/device/main/device-qemu-aarch64/weston.ini
similarity index 100%
rename from device/testing/device-qemu-aarch64/weston.ini
rename to device/main/device-qemu-aarch64/weston.ini
diff --git a/device/testing/device-qemu-amd64/APKBUILD b/device/main/device-qemu-amd64/APKBUILD
similarity index 93%
rename from device/testing/device-qemu-amd64/APKBUILD
rename to device/main/device-qemu-amd64/APKBUILD
index f5f832a7e..0ed7545eb 100644
--- a/device/testing/device-qemu-amd64/APKBUILD
+++ b/device/main/device-qemu-amd64/APKBUILD
@@ -1,6 +1,8 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Contributor: Oliver Smith <ollieparanoid@postmarketos.org>
 # Contributor: Minecrell <minecrell@minecrell.net>
+# Maintainer: Minecrell <minecrell@minecrell.net>
+# Maintainer: Daniele Debernardi <drebrez@gmail.com>
 pkgname=device-qemu-amd64
 pkgver=2
 pkgrel=0
diff --git a/device/testing/device-qemu-amd64/device-qemu-amd64-xfce4.post-install b/device/main/device-qemu-amd64/device-qemu-amd64-xfce4.post-install
similarity index 100%
rename from device/testing/device-qemu-amd64/device-qemu-amd64-xfce4.post-install
rename to device/main/device-qemu-amd64/device-qemu-amd64-xfce4.post-install
diff --git a/device/testing/device-qemu-amd64/deviceinfo b/device/main/device-qemu-amd64/deviceinfo
similarity index 100%
rename from device/testing/device-qemu-amd64/deviceinfo
rename to device/main/device-qemu-amd64/deviceinfo
diff --git a/device/testing/device-qemu-amd64/weston.ini b/device/main/device-qemu-amd64/weston.ini
similarity index 100%
rename from device/testing/device-qemu-amd64/weston.ini
rename to device/main/device-qemu-amd64/weston.ini