diff --git a/device/testing/device-cutiepi-tablet/95-vchiq-permissions.rules b/device/downstream/device-cutiepi-tablet/95-vchiq-permissions.rules
similarity index 100%
rename from device/testing/device-cutiepi-tablet/95-vchiq-permissions.rules
rename to device/downstream/device-cutiepi-tablet/95-vchiq-permissions.rules
diff --git a/device/testing/device-cutiepi-tablet/APKBUILD b/device/downstream/device-cutiepi-tablet/APKBUILD
similarity index 94%
rename from device/testing/device-cutiepi-tablet/APKBUILD
rename to device/downstream/device-cutiepi-tablet/APKBUILD
index 55441410f..34f501e25 100644
--- a/device/testing/device-cutiepi-tablet/APKBUILD
+++ b/device/downstream/device-cutiepi-tablet/APKBUILD
@@ -60,7 +60,7 @@ adea3fb928b821420a8bdfa61ff3bab571c2a23706404d6a5e47fbda27131f7b03333487d1a7a8cf
 e3515cf9f41807917eac1f7663e0131bd18783824facf15f2bb0381635bf6d9a0c334f3786b6fb76d01469de6449878c871f8b747f45e9e3cee77699905cf319  modules-initfs
 afc9f83be2b4d089fa1e2c17f7fcfe7f5131233c5f3ff7bca1d95e080416088c5d2f65b7146021fca6eec492ad67961d1fb5ee58b02fb9ddfa7b5b2a586e238d  mpu6050-i2c5-overlay.dts
 9fbf1e8fcad332980b345b1a5eb0b92e752e6f5490027084f5d5713dc113ea20c71932a44ec5a0e077798fee99e52b8db13c8bb2cd263f4d39bfe9d27ca51b2d  backlight.rules
-26d14d996561ef29de965bdcd9e2ee93192e76c7ab08c805f71bab550d7c938248ca72c744c78f351791d3312751f60ed74b21ce3e16515ceff2a03e0f8e8c01  config.txt
+64e3faa4976ddf83f42d32f925b8ad6e41acfe934e761e949f3636266608a95ca1fc014420e26b0682d1eac799735d728464d2ef37bce1f3c0d524f3873cce0f  config.txt
 2d69cf6b05c3a97dde203fd2b174e7817ac85680f8f5adc607bdb0e888dde3e448a5e91848c899ad49fe5f777facba0050ffa25402e5babd1992958bcbd92fd8  usercfg.txt
 7e5505cb07d5b4a81bd28443d508336b5c547356538f1c06f91ed93ad0d7d456d4f74f1d24df5a2e08c17e74f0a66607352ac4874e967e9a91dfec9522d2d58d  95-vchiq-permissions.rules
 "
diff --git a/device/testing/device-cutiepi-tablet/backlight.rules b/device/downstream/device-cutiepi-tablet/backlight.rules
similarity index 100%
rename from device/testing/device-cutiepi-tablet/backlight.rules
rename to device/downstream/device-cutiepi-tablet/backlight.rules
diff --git a/device/testing/device-cutiepi-tablet/config.txt b/device/downstream/device-cutiepi-tablet/config.txt
similarity index 90%
rename from device/testing/device-cutiepi-tablet/config.txt
rename to device/downstream/device-cutiepi-tablet/config.txt
index b34f5feea..ab6981a76 100644
--- a/device/testing/device-cutiepi-tablet/config.txt
+++ b/device/downstream/device-cutiepi-tablet/config.txt
@@ -4,7 +4,7 @@ arm_control=0x200
 arm_64bit=1
 arm_boost=1
 
-kernel=vmlinuz-rpi4
+kernel=vmlinuz-rpi
 initramfs initramfs
 
 dtoverlay=vc4-kms-v3d-pi4
diff --git a/device/testing/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-install b/device/downstream/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-install
similarity index 100%
rename from device/testing/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-install
rename to device/downstream/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-install
diff --git a/device/testing/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-upgrade b/device/downstream/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-upgrade
similarity index 100%
rename from device/testing/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-upgrade
rename to device/downstream/device-cutiepi-tablet/device-cutiepi-tablet-openrc.post-upgrade
diff --git a/device/testing/device-cutiepi-tablet/deviceinfo b/device/downstream/device-cutiepi-tablet/deviceinfo
similarity index 100%
rename from device/testing/device-cutiepi-tablet/deviceinfo
rename to device/downstream/device-cutiepi-tablet/deviceinfo
diff --git a/device/testing/device-cutiepi-tablet/modules-initfs b/device/downstream/device-cutiepi-tablet/modules-initfs
similarity index 100%
rename from device/testing/device-cutiepi-tablet/modules-initfs
rename to device/downstream/device-cutiepi-tablet/modules-initfs
diff --git a/device/testing/device-cutiepi-tablet/mpu6050-i2c5-overlay.dts b/device/downstream/device-cutiepi-tablet/mpu6050-i2c5-overlay.dts
similarity index 100%
rename from device/testing/device-cutiepi-tablet/mpu6050-i2c5-overlay.dts
rename to device/downstream/device-cutiepi-tablet/mpu6050-i2c5-overlay.dts
diff --git a/device/testing/device-cutiepi-tablet/usercfg.txt b/device/downstream/device-cutiepi-tablet/usercfg.txt
similarity index 100%
rename from device/testing/device-cutiepi-tablet/usercfg.txt
rename to device/downstream/device-cutiepi-tablet/usercfg.txt