diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml
index e5bd1ffc22..f4618d5ac9 100644
--- a/.github/workflows/build-armbian.yml
+++ b/.github/workflows/build-armbian.yml
@@ -54,6 +54,7 @@ on:
           - h68k
           - eaidk-610
           - king3399
+          - kylin3399
           - tn3399
           - beikeyun
           - l1pro
diff --git a/.github/workflows/rebuild-armbian.yml b/.github/workflows/rebuild-armbian.yml
index 6e210d69ec..2d6bf80824 100644
--- a/.github/workflows/rebuild-armbian.yml
+++ b/.github/workflows/rebuild-armbian.yml
@@ -48,6 +48,7 @@ on:
           - h68k
           - eaidk-610
           - king3399
+          - kylin3399
           - tn3399
           - beikeyun
           - l1pro
diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml
index d261b763bf..25c8a47eb5 100644
--- a/.github/workflows/use-releases-file-to-build.yml
+++ b/.github/workflows/use-releases-file-to-build.yml
@@ -54,6 +54,7 @@ on:
           - h68k
           - eaidk-610
           - king3399
+          - kylin3399
           - tn3399
           - beikeyun
           - l1pro
diff --git a/build-armbian/armbian-files/common-files/etc/model_database.conf b/build-armbian/armbian-files/common-files/etc/model_database.conf
index beec5876cf..cc2ffbf985 100644
--- a/build-armbian/armbian-files/common-files/etc/model_database.conf
+++ b/build-armbian/armbian-files/common-files/etc/model_database.conf
@@ -177,6 +177,7 @@ r204    :H68K                        :rk3568   :rk3568-opc-h68k.dtb
 r301    :EAIDK-610                   :rk3399   :rk3399-eaidk-610.dtb                   :NA                           :u-boot.itb                          :idbloader.img                   :6.x.y           :rockchip   :rk3399        :armbianEnv.txt  :eaidk-610       :yes
 r302    :KING3399                    :rk3399   :rk3399-king3399.dtb                    :trust.bin                    :u-boot.img                          :idbloader.bin                   :stable          :rockchip   :rk3399        :armbianEnv.txt  :king3399        :yes
 r303    :TN3399                      :rk3399   :rk3399-tn3399.dtb                      :trust.bin                    :u-boot.img                          :idbloader.bin                   :stable          :rockchip   :rk3399        :armbianEnv.txt  :tn3399          :yes
+r304    :KYLIN3399                   :rk3399   :rk3399-kylin3399.dtb                   :trust.bin                    :u-boot.img                          :idbloader.bin                   :stable          :rockchip   :rk3399        :armbianEnv.txt  :kylin3399       :yes
 
 
 # Rockchip RK3328 Family
diff --git a/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/rk3399-kylin3399.dtb b/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/rk3399-kylin3399.dtb
new file mode 100644
index 0000000000..2ea92018e4
Binary files /dev/null and b/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/rk3399-kylin3399.dtb differ
diff --git a/build-armbian/u-boot/rockchip/kylin3399/idbloader.bin b/build-armbian/u-boot/rockchip/kylin3399/idbloader.bin
new file mode 100644
index 0000000000..fd0251771a
Binary files /dev/null and b/build-armbian/u-boot/rockchip/kylin3399/idbloader.bin differ
diff --git a/build-armbian/u-boot/rockchip/kylin3399/rkspi_loader.img b/build-armbian/u-boot/rockchip/kylin3399/rkspi_loader.img
new file mode 100644
index 0000000000..59564b997e
Binary files /dev/null and b/build-armbian/u-boot/rockchip/kylin3399/rkspi_loader.img differ
diff --git a/build-armbian/u-boot/rockchip/kylin3399/trust.bin b/build-armbian/u-boot/rockchip/kylin3399/trust.bin
new file mode 100644
index 0000000000..000abf6e88
Binary files /dev/null and b/build-armbian/u-boot/rockchip/kylin3399/trust.bin differ
diff --git a/build-armbian/u-boot/rockchip/kylin3399/uboot.img b/build-armbian/u-boot/rockchip/kylin3399/uboot.img
new file mode 100644
index 0000000000..58fe8a5a96
Binary files /dev/null and b/build-armbian/u-boot/rockchip/kylin3399/uboot.img differ