diff --git a/device/testing/device-beelink-gt1/APKBUILD b/device/testing/device-beelink-gt1/APKBUILD
index 86d3b3e74..67dc55661 100644
--- a/device/testing/device-beelink-gt1/APKBUILD
+++ b/device/testing/device-beelink-gt1/APKBUILD
@@ -1,23 +1,21 @@
 # Reference: <https://postmarketos.org/devicepkg>
 # Maintainer:
 pkgname=device-beelink-gt1
-pkgver=2
-pkgrel=1
+pkgver=3
+pkgrel=0
 pkgdesc="Beelink gt1 (Ultimate)"
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base u-boot-amlogic-beelink-gt1 soc-amlogic-s905"
+depends="postmarketos-base u-boot-amlogic-beelink-gt1 soc-amlogic-s905 linux-postmarketos-amlogic"
 makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-kernel-alpine:kernel_alpine
-	$pkgname-kernel-amlogic:kernel_amlogic
-	$pkgname-nonfree-firmware:nonfree_firmware
-	"
+provides="$pkgname-kernel-amlogic=$pkgver-r$pkgrel $pkgname-kernel-alpine=$pkgver-r$pkgrel"
+replaces="$pkgname-kernel-amlogic=$pkgver-r$pkgrel $pkgname-kernel-alpine=$pkgver-r$pkgrel"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
 source="
 	asound.state
-	deviceinfo modules-initfs.alpine modules-initfs.amlogic"
+	deviceinfo modules-initfs"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -29,18 +27,6 @@ package() {
 		"$pkgdir"/var/lib/alsa/asound.state
 }
 
-kernel_alpine() {
-	pkgdesc="linux-edge from Alpine"
-	depends="linux-edge"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_amlogic() {
-	pkgdesc="linux-postmarketos-amlogic from postmarketOS"
-	depends="linux-postmarketos-amlogic"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
 nonfree_firmware() {
 	pkgdesc="Beelink gt1 Firmware"
 	depends="firmware-beelink-gt1 linux-firmware-meson"
@@ -51,6 +37,5 @@ nonfree_firmware() {
 sha512sums="
 a38e33d5bce26549c73f9aad2988ef8d7e7a3bbb28ac37348545fe7edb935be1b51dbdf8a857fb9d49be7e6eab7d40ac2f11fdcd618487747b809f7236ccf57b  asound.state
 b6099ab1d0f1f0f7d00c65275d0f5366793adf8755296408e0494decf4f6740e425ed1013c9940bdb869e66283b890b3e7446fbf171f3da692b1b67c9381c23f  deviceinfo
-b9f3e1902c17909de928c99868265a257ba5873f6ea6aa1097ad10721f59d68342d50ee51992472ecd23722f7664a13dd15f4e26071a40595c7c3e5161e533d7  modules-initfs.alpine
-52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs.amlogic
+52948c2884a6f6384e12b7a598f70878526d0d3293c214425170145231144ec7de805c038641741a4a5d75b50e554f6a3fa3769784a674217ed032f9b6a233c8  modules-initfs
 "
diff --git a/device/testing/device-beelink-gt1/modules-initfs.amlogic b/device/testing/device-beelink-gt1/modules-initfs
similarity index 100%
rename from device/testing/device-beelink-gt1/modules-initfs.amlogic
rename to device/testing/device-beelink-gt1/modules-initfs
diff --git a/device/testing/device-beelink-gt1/modules-initfs.alpine b/device/testing/device-beelink-gt1/modules-initfs.alpine
deleted file mode 100644
index 8f40a7055..000000000
--- a/device/testing/device-beelink-gt1/modules-initfs.alpine
+++ /dev/null
@@ -1,12 +0,0 @@
-fixed
-meson_gxbb_wdt
-meson_wdt
-meson-gx-mmc
-dw_hdmi
-drm_display_helper
-cec
-display_connector
-drm_kms_helper
-drm
-meson_drm
-meson_dw_hdmi