diff --git a/device/archived/device-samsung-baffinlite/APKBUILD b/device/archived/device-samsung-baffinlite/APKBUILD
deleted file mode 100644
index 24a8d0553..000000000
--- a/device/archived/device-samsung-baffinlite/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Archived: unmaintained
-# Reference: <https://postmarketos.org/devicepkg>
-maintainer=""
-pkgname=device-samsung-baffinlite
-pkgdesc="Samsung Galaxy Grand Neo"
-pkgver=5
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="armv7"
-options="!check !archcheck"
-depends="postmarketos-base linux-samsung-baffinlite mkbootimg"
-makedepends="devicepkg-dev"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
-source="deviceinfo
-	kernel-cmdline.conf
-	modules-load.conf"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-nonfree_firmware() {
-	pkgdesc="Wifi firmware"
-	depends="firmware-samsung-baffinlite"
-	mkdir "$subpkgdir"
-}
-
-sha512sums="
-c564925f6744914fbfdfc93c14df4aa07264b13e22b4de857abcafa195f60f2a6e2c2e5ce5ad2113812856c6c896017b3825e4ba5b43e4afed231a84de73c548  deviceinfo
-286d590a20720df1ae56f73fa6d1c0f92b3d8218cab99fc502ef41095ff85288726ff9993c9404500e111229e421bb0d2b284621cb4d04ac2930174549d8c7fa  kernel-cmdline.conf
-af036fe35011db078379dbb2e8c16c86546f0a4fcb3d1bcee3502bb1ea5b38f3ec5a9fa8cd1ca8ed8b89592a7f572d6072781289845303e0bf85fc2de4ead9fb  modules-load.conf
-"
diff --git a/device/archived/device-samsung-baffinlite/kernel-cmdline.conf b/device/archived/device-samsung-baffinlite/kernel-cmdline.conf
deleted file mode 100644
index 5c56f4f7c..000000000
--- a/device/archived/device-samsung-baffinlite/kernel-cmdline.conf
+++ /dev/null
@@ -1 +0,0 @@
-androidboot.selinux=permissive
diff --git a/device/archived/device-samsung-baffinlite/modules-load.conf b/device/archived/device-samsung-baffinlite/modules-load.conf
deleted file mode 100644
index 46b277676..000000000
--- a/device/archived/device-samsung-baffinlite/modules-load.conf
+++ /dev/null
@@ -1 +0,0 @@
-dhd
diff --git a/device/testing/device-samsung-baffinlite/APKBUILD b/device/testing/device-samsung-baffinlite/APKBUILD
new file mode 100644
index 000000000..2c5b3723e
--- /dev/null
+++ b/device/testing/device-samsung-baffinlite/APKBUILD
@@ -0,0 +1,25 @@
+# Reference: <https://postmarketos.org/devicepkg>
+maintainer="knuxify <knuxify@gmail.com>"
+pkgname=device-samsung-baffinlite
+pkgdesc="Samsung Galaxy Grand Neo"
+pkgver=5
+pkgrel=0
+url="https://postmarketos.org"
+license="MIT"
+arch="armv7"
+options="!check !archcheck"
+depends="postmarketos-base linux-postmarketos-brcm-kona mkbootimg firmware-samsung-baffinlite"
+makedepends="devicepkg-dev"
+source="deviceinfo"
+
+build() {
+	devicepkg_build $startdir $pkgname
+}
+
+package() {
+	devicepkg_package $startdir $pkgname
+}
+
+sha512sums="
+695f8fac1eb576320c0ce990a4a07acf59ee123ffcc7fa8ba0d0c73a85f1414b0a78c0e8cc6633531a6998635d92bbe18cc03a44c933b96670be8c90dabf5631  deviceinfo
+"
diff --git a/device/archived/device-samsung-baffinlite/deviceinfo b/device/testing/device-samsung-baffinlite/deviceinfo
similarity index 87%
rename from device/archived/device-samsung-baffinlite/deviceinfo
rename to device/testing/device-samsung-baffinlite/deviceinfo
index cb677789b..cbeea18af 100644
--- a/device/archived/device-samsung-baffinlite/deviceinfo
+++ b/device/testing/device-samsung-baffinlite/deviceinfo
@@ -7,6 +7,7 @@ deviceinfo_manufacturer="Samsung"
 deviceinfo_codename="samsung-baffinlite"
 deviceinfo_year="2014"
 deviceinfo_arch="armv7"
+deviceinfo_append_dtb="true"
 
 # Device related
 deviceinfo_chassis="handset"
@@ -14,6 +15,7 @@ deviceinfo_external_storage="true"
 deviceinfo_screen_width="480"
 deviceinfo_screen_height="800"
 deviceinfo_create_initfs_extra="true"
+deviceinfo_getty="ttyS2;115200"
 
 # Bootloader related
 deviceinfo_flash_method="heimdall-bootimg"
@@ -26,3 +28,5 @@ deviceinfo_flash_offset_tags="0x00000100"
 deviceinfo_flash_pagesize="4096"
 deviceinfo_flash_heimdall_partition_rootfs="system"
 deviceinfo_flash_sparse="true"
+deviceinfo_dtb="bcm23550-samsung-baffinlite"
+deviceinfo_drm="true"