diff --git a/Image.gz-dtb-4.14 b/Image.gz-dtb-4.14
deleted file mode 100644
index dc0a4cf..0000000
--- a/Image.gz-dtb-4.14
+++ /dev/null
Binary files differ
diff --git a/Image.gz-dtb-4.19 b/Image.gz-dtb-4.19
deleted file mode 100644
index f4652e7..0000000
--- a/Image.gz-dtb-4.19
+++ /dev/null
Binary files differ
diff --git a/Image.gz-dtb-hikey960-4.14 b/Image.gz-dtb-hikey960-4.14
deleted file mode 100644
index 06a9262..0000000
--- a/Image.gz-dtb-hikey960-4.14
+++ /dev/null
Binary files differ
diff --git a/Image.gz-dtb-hikey960-4.19 b/Image.gz-dtb-hikey960-4.19
deleted file mode 100644
index 6412777..0000000
--- a/Image.gz-dtb-hikey960-4.19
+++ /dev/null
Binary files differ
diff --git a/hi3660-hikey960.dtb-4.19 b/hi3660-hikey960.dtb-4.19
deleted file mode 100644
index 3997944..0000000
--- a/hi3660-hikey960.dtb-4.19
+++ /dev/null
Binary files differ
diff --git a/hikey/4.14/Image.gz-dtb b/hikey/4.14/Image.gz-dtb
new file mode 100644
index 0000000..d1581b2
--- /dev/null
+++ b/hikey/4.14/Image.gz-dtb
Binary files differ
diff --git a/hi6220-hikey.dtb-4.14 b/hikey/4.14/hi6220-hikey.dtb
similarity index 80%
rename from hi6220-hikey.dtb-4.14
rename to hikey/4.14/hi6220-hikey.dtb
index 3615315..c64491f 100644
--- a/hi6220-hikey.dtb-4.14
+++ b/hikey/4.14/hi6220-hikey.dtb
Binary files differ
diff --git a/hikey/4.19/Image.gz-dtb b/hikey/4.19/Image.gz-dtb
new file mode 100644
index 0000000..5afcbf0
--- /dev/null
+++ b/hikey/4.19/Image.gz-dtb
Binary files differ
diff --git a/hi6220-hikey.dtb-4.19 b/hikey/4.19/hi6220-hikey.dtb
similarity index 77%
rename from hi6220-hikey.dtb-4.19
rename to hikey/4.19/hi6220-hikey.dtb
index 1290795..7a48323 100644
--- a/hi6220-hikey.dtb-4.19
+++ b/hikey/4.19/hi6220-hikey.dtb
Binary files differ
diff --git a/hikey960/4.14/Image.gz-dtb b/hikey960/4.14/Image.gz-dtb
new file mode 100644
index 0000000..6493a81
--- /dev/null
+++ b/hikey960/4.14/Image.gz-dtb
Binary files differ
diff --git a/hi3660-hikey960.dtb-4.14 b/hikey960/4.14/hi3660-hikey960.dtb
similarity index 100%
rename from hi3660-hikey960.dtb-4.14
rename to hikey960/4.14/hi3660-hikey960.dtb
Binary files differ
diff --git a/hikey960/4.19/Image.gz-dtb b/hikey960/4.19/Image.gz-dtb
new file mode 100644
index 0000000..1f5367b
--- /dev/null
+++ b/hikey960/4.19/Image.gz-dtb
Binary files differ
diff --git a/hikey960/4.19/hi3660-hikey960.dtb b/hikey960/4.19/hi3660-hikey960.dtb
new file mode 100644
index 0000000..ddbac61
--- /dev/null
+++ b/hikey960/4.19/hi3660-hikey960.dtb
Binary files differ
diff --git a/hikey960/5.4/Image b/hikey960/5.4/Image
new file mode 100644
index 0000000..37a1ea4
--- /dev/null
+++ b/hikey960/5.4/Image
Binary files differ
diff --git a/hikey960/5.4/Image.gz-dtb b/hikey960/5.4/Image.gz-dtb
new file mode 100644
index 0000000..2cfd83e
--- /dev/null
+++ b/hikey960/5.4/Image.gz-dtb
Binary files differ
diff --git a/hikey960/5.4/adv7511.ko b/hikey960/5.4/adv7511.ko
new file mode 100644
index 0000000..8728867
--- /dev/null
+++ b/hikey960/5.4/adv7511.ko
Binary files differ
diff --git a/hikey960/5.4/ambakmi.ko b/hikey960/5.4/ambakmi.ko
new file mode 100644
index 0000000..7683182
--- /dev/null
+++ b/hikey960/5.4/ambakmi.ko
Binary files differ
diff --git a/hikey960/5.4/armmmci.ko b/hikey960/5.4/armmmci.ko
new file mode 100644
index 0000000..494df23
--- /dev/null
+++ b/hikey960/5.4/armmmci.ko
Binary files differ
diff --git a/hikey960/5.4/clk-hi655x.ko b/hikey960/5.4/clk-hi655x.ko
new file mode 100644
index 0000000..f937be2
--- /dev/null
+++ b/hikey960/5.4/clk-hi655x.ko
Binary files differ
diff --git a/hikey960/5.4/cma_heap.ko b/hikey960/5.4/cma_heap.ko
new file mode 100644
index 0000000..1bde4ae
--- /dev/null
+++ b/hikey960/5.4/cma_heap.ko
Binary files differ
diff --git a/hikey960/5.4/cn.ko b/hikey960/5.4/cn.ko
new file mode 100644
index 0000000..f8413ee
--- /dev/null
+++ b/hikey960/5.4/cn.ko
Binary files differ
diff --git a/hikey960/5.4/cpufreq-dt.ko b/hikey960/5.4/cpufreq-dt.ko
new file mode 100644
index 0000000..12dcd7b
--- /dev/null
+++ b/hikey960/5.4/cpufreq-dt.ko
Binary files differ
diff --git a/hikey960/5.4/crc-itu-t.ko b/hikey960/5.4/crc-itu-t.ko
new file mode 100644
index 0000000..d255c5a
--- /dev/null
+++ b/hikey960/5.4/crc-itu-t.ko
Binary files differ
diff --git a/hikey960/5.4/crc7.ko b/hikey960/5.4/crc7.ko
new file mode 100644
index 0000000..774bc08
--- /dev/null
+++ b/hikey960/5.4/crc7.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc-exynos.ko b/hikey960/5.4/dw_mmc-exynos.ko
new file mode 100644
index 0000000..3c312b0
--- /dev/null
+++ b/hikey960/5.4/dw_mmc-exynos.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc-k3.ko b/hikey960/5.4/dw_mmc-k3.ko
new file mode 100644
index 0000000..8735ca8
--- /dev/null
+++ b/hikey960/5.4/dw_mmc-k3.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc-pltfm.ko b/hikey960/5.4/dw_mmc-pltfm.ko
new file mode 100644
index 0000000..e13aec1
--- /dev/null
+++ b/hikey960/5.4/dw_mmc-pltfm.ko
Binary files differ
diff --git a/hikey960/5.4/dw_mmc.ko b/hikey960/5.4/dw_mmc.ko
new file mode 100644
index 0000000..594d6e3
--- /dev/null
+++ b/hikey960/5.4/dw_mmc.ko
Binary files differ
diff --git a/hikey960/5.4/ehci-hcd.ko b/hikey960/5.4/ehci-hcd.ko
new file mode 100644
index 0000000..8765e5c
--- /dev/null
+++ b/hikey960/5.4/ehci-hcd.ko
Binary files differ
diff --git a/hikey960/5.4/ehci-pci.ko b/hikey960/5.4/ehci-pci.ko
new file mode 100644
index 0000000..ca8c846
--- /dev/null
+++ b/hikey960/5.4/ehci-pci.ko
Binary files differ
diff --git a/hikey960/5.4/ehci-platform.ko b/hikey960/5.4/ehci-platform.ko
new file mode 100644
index 0000000..c2c9660
--- /dev/null
+++ b/hikey960/5.4/ehci-platform.ko
Binary files differ
diff --git a/hikey960/5.4/erofs.ko b/hikey960/5.4/erofs.ko
new file mode 100644
index 0000000..d7e7e2e
--- /dev/null
+++ b/hikey960/5.4/erofs.ko
Binary files differ
diff --git a/hikey960/5.4/gadgetfs.ko b/hikey960/5.4/gadgetfs.ko
new file mode 100644
index 0000000..45214bd
--- /dev/null
+++ b/hikey960/5.4/gadgetfs.ko
Binary files differ
diff --git a/hikey960/5.4/hi3660-hikey960.dtb b/hikey960/5.4/hi3660-hikey960.dtb
new file mode 100644
index 0000000..b133f4d
--- /dev/null
+++ b/hikey960/5.4/hi3660-hikey960.dtb
Binary files differ
diff --git a/hikey960/5.4/hi3660-i2s.ko b/hikey960/5.4/hi3660-i2s.ko
new file mode 100644
index 0000000..2f2b4fd
--- /dev/null
+++ b/hikey960/5.4/hi3660-i2s.ko
Binary files differ
diff --git a/hikey960/5.4/hi3660-mailbox.ko b/hikey960/5.4/hi3660-mailbox.ko
new file mode 100644
index 0000000..27424bd
--- /dev/null
+++ b/hikey960/5.4/hi3660-mailbox.ko
Binary files differ
diff --git a/hikey960/5.4/hi6421-pmic-core.ko b/hikey960/5.4/hi6421-pmic-core.ko
new file mode 100644
index 0000000..a50d76c
--- /dev/null
+++ b/hikey960/5.4/hi6421-pmic-core.ko
Binary files differ
diff --git a/hikey960/5.4/hi6421v530-regulator.ko b/hikey960/5.4/hi6421v530-regulator.ko
new file mode 100644
index 0000000..0f8dccb
--- /dev/null
+++ b/hikey960/5.4/hi6421v530-regulator.ko
Binary files differ
diff --git a/hikey960/5.4/hi655x-pmic.ko b/hikey960/5.4/hi655x-pmic.ko
new file mode 100644
index 0000000..a3ddf74
--- /dev/null
+++ b/hikey960/5.4/hi655x-pmic.ko
Binary files differ
diff --git a/hikey960/5.4/hi655x-regulator.ko b/hikey960/5.4/hi655x-regulator.ko
new file mode 100644
index 0000000..743834a
--- /dev/null
+++ b/hikey960/5.4/hi655x-regulator.ko
Binary files differ
diff --git a/hikey960/5.4/hisi_hikey_usb.ko b/hikey960/5.4/hisi_hikey_usb.ko
new file mode 100644
index 0000000..d978233
--- /dev/null
+++ b/hikey960/5.4/hisi_hikey_usb.ko
Binary files differ
diff --git a/hikey960/5.4/hisi_powerkey.ko b/hikey960/5.4/hisi_powerkey.ko
new file mode 100644
index 0000000..8918593
--- /dev/null
+++ b/hikey960/5.4/hisi_powerkey.ko
Binary files differ
diff --git a/hikey960/5.4/hisi_thermal.ko b/hikey960/5.4/hisi_thermal.ko
new file mode 100644
index 0000000..2ff7b7a
--- /dev/null
+++ b/hikey960/5.4/hisi_thermal.ko
Binary files differ
diff --git a/hikey960/5.4/hwmon.ko b/hikey960/5.4/hwmon.ko
new file mode 100644
index 0000000..9a8bf62
--- /dev/null
+++ b/hikey960/5.4/hwmon.ko
Binary files differ
diff --git a/hikey960/5.4/i2c-designware-core.ko b/hikey960/5.4/i2c-designware-core.ko
new file mode 100644
index 0000000..09564d8
--- /dev/null
+++ b/hikey960/5.4/i2c-designware-core.ko
Binary files differ
diff --git a/hikey960/5.4/i2c-designware-platform.ko b/hikey960/5.4/i2c-designware-platform.ko
new file mode 100644
index 0000000..3a888e6
--- /dev/null
+++ b/hikey960/5.4/i2c-designware-platform.ko
Binary files differ
diff --git a/hikey960/5.4/i2c-dev.ko b/hikey960/5.4/i2c-dev.ko
new file mode 100644
index 0000000..afe514c
--- /dev/null
+++ b/hikey960/5.4/i2c-dev.ko
Binary files differ
diff --git a/hikey960/5.4/ion_cma_heap.ko b/hikey960/5.4/ion_cma_heap.ko
new file mode 100644
index 0000000..23e51f3
--- /dev/null
+++ b/hikey960/5.4/ion_cma_heap.ko
Binary files differ
diff --git a/hikey960/5.4/k3dma.ko b/hikey960/5.4/k3dma.ko
new file mode 100644
index 0000000..121df42
--- /dev/null
+++ b/hikey960/5.4/k3dma.ko
Binary files differ
diff --git a/hikey960/5.4/kirin-drm.ko b/hikey960/5.4/kirin-drm.ko
new file mode 100644
index 0000000..120fba5
--- /dev/null
+++ b/hikey960/5.4/kirin-drm.ko
Binary files differ
diff --git a/hikey960/5.4/kirin-dsi.ko b/hikey960/5.4/kirin-dsi.ko
new file mode 100644
index 0000000..bc81203
--- /dev/null
+++ b/hikey960/5.4/kirin-dsi.ko
Binary files differ
diff --git a/hikey960/5.4/mali_kbase.ko b/hikey960/5.4/mali_kbase.ko
new file mode 100644
index 0000000..5c5f9f9
--- /dev/null
+++ b/hikey960/5.4/mali_kbase.ko
Binary files differ
diff --git a/hikey960/5.4/mmc_block.ko b/hikey960/5.4/mmc_block.ko
new file mode 100644
index 0000000..5f1b986
--- /dev/null
+++ b/hikey960/5.4/mmc_block.ko
Binary files differ
diff --git a/hikey960/5.4/mmc_spi.ko b/hikey960/5.4/mmc_spi.ko
new file mode 100644
index 0000000..a640d59
--- /dev/null
+++ b/hikey960/5.4/mmc_spi.ko
Binary files differ
diff --git a/hikey960/5.4/nvme-core.ko b/hikey960/5.4/nvme-core.ko
new file mode 100644
index 0000000..d6ed203
--- /dev/null
+++ b/hikey960/5.4/nvme-core.ko
Binary files differ
diff --git a/hikey960/5.4/nvme.ko b/hikey960/5.4/nvme.ko
new file mode 100644
index 0000000..f074075
--- /dev/null
+++ b/hikey960/5.4/nvme.ko
Binary files differ
diff --git a/hikey960/5.4/nvmet.ko b/hikey960/5.4/nvmet.ko
new file mode 100644
index 0000000..a5b3433
--- /dev/null
+++ b/hikey960/5.4/nvmet.ko
Binary files differ
diff --git a/hikey960/5.4/of_mmc_spi.ko b/hikey960/5.4/of_mmc_spi.ko
new file mode 100644
index 0000000..823dd54
--- /dev/null
+++ b/hikey960/5.4/of_mmc_spi.ko
Binary files differ
diff --git a/hikey960/5.4/ohci-hcd.ko b/hikey960/5.4/ohci-hcd.ko
new file mode 100644
index 0000000..0b324fc
--- /dev/null
+++ b/hikey960/5.4/ohci-hcd.ko
Binary files differ
diff --git a/hikey960/5.4/ohci-pci.ko b/hikey960/5.4/ohci-pci.ko
new file mode 100644
index 0000000..ab4d4d0
--- /dev/null
+++ b/hikey960/5.4/ohci-pci.ko
Binary files differ
diff --git a/hikey960/5.4/ohci-platform.ko b/hikey960/5.4/ohci-platform.ko
new file mode 100644
index 0000000..b9015d5
--- /dev/null
+++ b/hikey960/5.4/ohci-platform.ko
Binary files differ
diff --git a/hikey960/5.4/phy-hi3660-usb3.ko b/hikey960/5.4/phy-hi3660-usb3.ko
new file mode 100644
index 0000000..0f3ea5f
--- /dev/null
+++ b/hikey960/5.4/phy-hi3660-usb3.ko
Binary files differ
diff --git a/hikey960/5.4/reboot-mode.ko b/hikey960/5.4/reboot-mode.ko
new file mode 100644
index 0000000..20e675f
--- /dev/null
+++ b/hikey960/5.4/reboot-mode.ko
Binary files differ
diff --git a/hikey960/5.4/rfkill-gpio.ko b/hikey960/5.4/rfkill-gpio.ko
new file mode 100644
index 0000000..263139d
--- /dev/null
+++ b/hikey960/5.4/rfkill-gpio.ko
Binary files differ
diff --git a/hikey960/5.4/rtc-efi.ko b/hikey960/5.4/rtc-efi.ko
new file mode 100644
index 0000000..5186a2c
--- /dev/null
+++ b/hikey960/5.4/rtc-efi.ko
Binary files differ
diff --git a/hikey960/5.4/snd-soc-hdmi-codec.ko b/hikey960/5.4/snd-soc-hdmi-codec.ko
new file mode 100644
index 0000000..a9c5248
--- /dev/null
+++ b/hikey960/5.4/snd-soc-hdmi-codec.ko
Binary files differ
diff --git a/hikey960/5.4/snd-soc-simple-card-utils.ko b/hikey960/5.4/snd-soc-simple-card-utils.ko
new file mode 100644
index 0000000..a510b9e
--- /dev/null
+++ b/hikey960/5.4/snd-soc-simple-card-utils.ko
Binary files differ
diff --git a/hikey960/5.4/snd-soc-simple-card.ko b/hikey960/5.4/snd-soc-simple-card.ko
new file mode 100644
index 0000000..598ef59
--- /dev/null
+++ b/hikey960/5.4/snd-soc-simple-card.ko
Binary files differ
diff --git a/hikey960/5.4/spi-pl022.ko b/hikey960/5.4/spi-pl022.ko
new file mode 100644
index 0000000..a07980d
--- /dev/null
+++ b/hikey960/5.4/spi-pl022.ko
Binary files differ
diff --git a/hikey960/5.4/spidev.ko b/hikey960/5.4/spidev.ko
new file mode 100644
index 0000000..09f3b9b
--- /dev/null
+++ b/hikey960/5.4/spidev.ko
Binary files differ
diff --git a/hikey960/5.4/syscon-reboot-mode.ko b/hikey960/5.4/syscon-reboot-mode.ko
new file mode 100644
index 0000000..2f22732
--- /dev/null
+++ b/hikey960/5.4/syscon-reboot-mode.ko
Binary files differ
diff --git a/hikey960/5.4/system_heap.ko b/hikey960/5.4/system_heap.ko
new file mode 100644
index 0000000..8b5b1ed
--- /dev/null
+++ b/hikey960/5.4/system_heap.ko
Binary files differ
diff --git a/hikey960/5.4/tcpci.ko b/hikey960/5.4/tcpci.ko
new file mode 100644
index 0000000..b4019b7
--- /dev/null
+++ b/hikey960/5.4/tcpci.ko
Binary files differ
diff --git a/hikey960/5.4/tcpci_rt1711h.ko b/hikey960/5.4/tcpci_rt1711h.ko
new file mode 100644
index 0000000..2bc7a2f
--- /dev/null
+++ b/hikey960/5.4/tcpci_rt1711h.ko
Binary files differ
diff --git a/hikey960/5.4/virt-dma.ko b/hikey960/5.4/virt-dma.ko
new file mode 100644
index 0000000..c5942c8
--- /dev/null
+++ b/hikey960/5.4/virt-dma.ko
Binary files differ
diff --git a/hikey960/5.4/wl18xx.ko b/hikey960/5.4/wl18xx.ko
new file mode 100644
index 0000000..39f9fe3
--- /dev/null
+++ b/hikey960/5.4/wl18xx.ko
Binary files differ
diff --git a/hikey960/5.4/wlcore.ko b/hikey960/5.4/wlcore.ko
new file mode 100644
index 0000000..3b4b4f2
--- /dev/null
+++ b/hikey960/5.4/wlcore.ko
Binary files differ
diff --git a/hikey960/5.4/wlcore_sdio.ko b/hikey960/5.4/wlcore_sdio.ko
new file mode 100644
index 0000000..b2f0e80
--- /dev/null
+++ b/hikey960/5.4/wlcore_sdio.ko
Binary files differ
diff --git a/update-prebuilts.sh b/update-prebuilts.sh
new file mode 100755
index 0000000..5c25161
--- /dev/null
+++ b/update-prebuilts.sh
@@ -0,0 +1,45 @@
+#!/bin/bash -ex
+
+function wget_wrapper(){
+    local build_num="${1}" && shift
+    local board="${1}" && shift
+    local target_name="${1}" && shift
+    local local_name="${1}" && shift
+    wget https://ci.android.com/builds/submitted/${build_num}/kernel_${board}/latest/raw/${target_name} -O ${local_name}
+}
+
+function update_kernel_dtb_hikey960(){
+    local build_num="${1}" && shift
+    local kernel_version="${1}" && shift
+    local board="hikey960"
+    mkdir -p ${board}/${kernel_version}
+    wget_wrapper ${build_num} ${board} Image.gz-dtb ${board}/${kernel_version}/Image.gz-dtb
+    wget_wrapper ${build_num} ${board} hi3660-hikey960.dtb ${board}/${kernel_version}/hi3660-hikey960.dtb
+    wget_wrapper ${build_num} ${board} manifest_${build_num}.xml ${board}/${kernel_version}/manifest_${build_num}-${board}.xml
+}
+
+
+function update_kernel_dtb_hikey(){
+    local build_num="${1}" && shift
+    local kernel_version="${1}" && shift
+    local board="hikey"
+    rm -fr ${board}/${kernel_version}
+    mkdir -p ${board}/${kernel_version}
+    wget_wrapper ${build_num} ${board} Image.gz-dtb ${board}/${kernel_version}/Image.gz-dtb
+    wget_wrapper ${build_num} ${board} hi6220-hikey.dtb ${board}/${kernel_version}/hi6220-hikey.dtb
+    wget_wrapper ${build_num} ${board} manifest_${build_num}.xml ${board}/${kernel_version}/manifest_${build_num}-${board}.xml
+}
+
+function update_kernel_dtb(){
+    local build_num="${1}" && shift
+    local kernel_version="${1}" && shift
+
+#    update_kernel_dtb_hikey960 ${build_num} ${kernel_version}
+    update_kernel_dtb_hikey ${build_num} ${kernel_version}
+}
+
+# https://ci.android.com/builds/branches/aosp_kernel-hikey-linaro-android-4.19/grid?
+# https://ci.android.com/builds/submitted/6423191/kernel_hikey960/latest
+# https://ci.android.com/builds/submitted/6423191/kernel_hikey/latest
+update_kernel_dtb 6971857 4.14
+update_kernel_dtb 6972652 4.19