diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml
index 6851bbfd9b..e5af1a1d6a 100644
--- a/.github/workflows/build-armbian.yml
+++ b/.github/workflows/build-armbian.yml
@@ -55,6 +55,7 @@ on:
           - kylin3399
           - leez
           - lx-r3s
+          - hugsun-x99
           - nanopi-r5c
           - nanopi-r5s
           - panther-x2
diff --git a/.github/workflows/rebuild-armbian.yml b/.github/workflows/rebuild-armbian.yml
index 7918b26602..ebf75efcb1 100644
--- a/.github/workflows/rebuild-armbian.yml
+++ b/.github/workflows/rebuild-armbian.yml
@@ -47,6 +47,7 @@ on:
           - kylin3399
           - leez
           - lx-r3s
+          - hugsun-x99
           - nanopi-r5c
           - nanopi-r5s
           - panther-x2
diff --git a/.github/workflows/use-releases-file-to-build.yml b/.github/workflows/use-releases-file-to-build.yml
index 1fe57696c7..3aee33b207 100644
--- a/.github/workflows/use-releases-file-to-build.yml
+++ b/.github/workflows/use-releases-file-to-build.yml
@@ -55,6 +55,7 @@ on:
           - kylin3399
           - leez
           - lx-r3s
+          - hugsun-x99
           - nanopi-r5c
           - nanopi-r5s
           - panther-x2
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 d243494d40..eb28d8f3a8 100644
--- a/build-armbian/armbian-files/common-files/etc/model_database.conf
+++ b/build-armbian/armbian-files/common-files/etc/model_database.conf
@@ -243,6 +243,7 @@ r415    :DG-3399                            :rk3399   :rk3399-dg3399.dtb
 r416    :Fine3399                           :rk3399   :rk3399-fine3399.dtb                    :NA                           :u-boot.itb                          :idbloader.img                   :4GB-RAM,8G/16G/64G/128G-eMMC,TF,1Gb-Nic    :5.15.y        :rockchip    :rk3399       :armbianEnv.txt  :cm9vdA,r1172464137                    :fine3399            :yes
 r417    :SW799                              :rk3399   :rk3399-bozz-sw799.dtb                  :trust.bin                    :uboot.img                           :idbloader.bin                   :4GB-DDR3,16G-eMMC,1Gb-Nic                  :5.15.y        :rockchip    :rk3399       :armbianEnv.txt  :inoeud                                :sw799               :yes
 r418    :LX-R3S                             :rk3399   :rk3399-lx-r3s.dtb                      :trust.bin                    :uboot.img                           :idbloader.bin                   :2GB/4GB-DDR3,6G/16G/32G-eMMC,1Gb-Nic       :6.1.y         :rockchip    :rk3399       :armbianEnv.txt  :cm9vdA,kuuer                          :lx-r3s              :yes
+r419    :Hugsun-X99                         :rk3399   :rk3399-hugsun-x99.dtb                  :trust.bin                    :uboot.img                           :idbloader.bin                   :4GB-DDR3,32/64G-eMMC,1Gb-Nic               :6.1.y         :rockchip    :rk3399       :armbianEnv.txt  :lavateinn                             :hugsun-x99          :yes
 
 
 # Rockchip RK3328 Family
diff --git a/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/rk3399-hugsun-x99.dtb b/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/rk3399-hugsun-x99.dtb
new file mode 100644
index 0000000000..272bd8f3b6
Binary files /dev/null and b/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/rk3399-hugsun-x99.dtb differ