diff --git a/packages/firmware/debian/bcm4345/build.yaml b/packages/firmware/debian/bcm4345/build.yaml
deleted file mode 100644
index b91bf55..0000000
--- a/packages/firmware/debian/bcm4345/build.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-package_dir: /package
-steps:
-- apk add git
-- git clone --depth 1 https://github.com/armbian/firmware.git
-- |
-   cd firmware/ && \
-   mkdir -p /package/lib/firmware/brcm/ && \
-   cp brcm/BCM4345C5.hcd /package/lib/firmware/brcm/BCM4345C5.hcd && \
-   cp brcm/brcmfmac43456-sdio.txt /package/lib/firmware/brcm/brcmfmac43456-sdio.pine64,pinebook-pro.txt && \
-   cp brcm/brcmfmac43456-sdio.bin /package/lib/firmware/brcm/brcmfmac43456-sdio.bin && \
-   cp brcm/brcmfmac43456-sdio.clm_blob /package/lib/firmware/brcm/brcmfmac43456-sdio.clm_blob
-
-image: "alpine"
\ No newline at end of file
diff --git a/packages/firmware/debian/bcm4345/definition.yaml b/packages/firmware/debian/bcm4345/definition.yaml
deleted file mode 100644
index 5d68ab4..0000000
--- a/packages/firmware/debian/bcm4345/definition.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-category: "firmware"
-name: "bcm4345"
-version: "0.1"
\ No newline at end of file
diff --git a/packages/firmware/debian/u-boot-rockchip/build.yaml b/packages/firmware/debian/u-boot-rockchip/build.yaml
deleted file mode 100644
index 876fe21..0000000
--- a/packages/firmware/debian/u-boot-rockchip/build.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-image: ubuntu
-
-package_dir: /package
-prelude:
-- apt-get update
-- DEBIAN_FRONTEND=noninteractive apt-get install -y wget
-- mkdir /package
-- wget http://http.us.debian.org/debian/pool/main/u/u-boot/u-boot-rockchip_2023.01+dfsg-2_arm64.deb -O u-boot.deb
-steps:
-- dpkg -x u-boot.deb /package
diff --git a/packages/firmware/debian/u-boot-rockchip/definition.yaml b/packages/firmware/debian/u-boot-rockchip/definition.yaml
deleted file mode 100644
index 680ce2a..0000000
--- a/packages/firmware/debian/u-boot-rockchip/definition.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-category: arm-vendor-blob
-name: u-boot-rockchip
-version: "0.3"
-license: "mixed"
-license_url: "https://metadata.ftp-master.debian.org/changelogs//main/u/u-boot/u-boot_2022.10+dfsg-1_copyright"
\ No newline at end of file
diff --git a/packages/uboot/rockchip/build.yaml b/packages/uboot/rockchip/build.yaml
new file mode 100644
index 0000000..732524e
--- /dev/null
+++ b/packages/uboot/rockchip/build.yaml
@@ -0,0 +1,14 @@
+requires:
+  - name: "toolchain"
+    category: "development"
+    version: ">=0"
+
+package_dir: /package
+
+prelude:
+- wget http://http.us.debian.org/debian/pool/main/u/u-boot/u-boot-rockchip_2025.01-2_arm64.deb -O u-boot.deb
+steps:
+- mkdir -p /tmp/uboot
+- mkdir -p /package
+- dpkg -x u-boot.deb /tmp/uboot
+- cp /tmp/uboot/usr/lib/u-boot/pinebook-pro-rk3399/* /package
\ No newline at end of file
diff --git a/packages/uboot/rockchip/definition.yaml b/packages/uboot/rockchip/definition.yaml
new file mode 100644
index 0000000..ef0e8f6
--- /dev/null
+++ b/packages/uboot/rockchip/definition.yaml
@@ -0,0 +1,3 @@
+category: "uboot"
+name: "rockchip"
+version: "0.3.1"
\ No newline at end of file