diff --git a/.github/workflows/hi3536dv100_images.yml b/.github/workflows/hi3536dv100_images.yml
deleted file mode 100644
index 88965cf9..00000000
--- a/.github/workflows/hi3536dv100_images.yml
+++ /dev/null
@@ -1,152 +0,0 @@
-name: "Hi3536Dv100  "
-
-on:
-  push:
-    branches:
-      - production
-    tags:
-      - "v*"
-  schedule:
-      - cron: "00 03 * * *"
-  workflow_dispatch:
-
-jobs:
-  build_core:
-    name: OpenIPC firmware for Hi3536Dv100
-    runs-on: ubuntu-latest
-
-    steps:
-
-      - name: Checkout
-        id: checkout
-        uses: actions/checkout@v2
-
-      - name: Install build dependencies
-        run: |
-          make install-deps
-          mkdir -p tmp
-          if [ ! -z "$ACT" ]; then
-            apt install -y cpio rsync bc
-            echo "FORCE_UNSAFE_CONFIGURE=1" >> $GITHUB_ENV
-            # Mitigate #325 issue
-            apt install -y pip && pip install cmake
-          else
-            # https://github.com/actions/runner-images/issues/2577
-            echo "1.1.1.1 invisible-mirror.net" | sudo tee -a /etc/hosts
-          fi
-
-      - name: Free disk space
-        if: ${{ !env.ACT }}
-        run: |
-          sudo swapoff -a
-          sudo rm -f /swapfile
-          sudo apt clean
-          docker rmi $(docker image ls -aq)
-          df -h
-
-      - name: Prepare buildroot
-        id: prepare
-        run: |
-          HEAD_TAG=$(git tag --points-at HEAD)
-          GIT_HASH=$(git rev-parse --short $GITHUB_SHA)
-          BRANCH_NAME=$(echo $GITHUB_REF | cut -d'/' -f 3)
-          if [ -z "$HEAD_TAG" ]; then
-            TAG_NAME="latest"
-            RELEASE_NAME="Development Build"
-            PRERELEASE=true
-          else
-            TAG_NAME=${{ github.ref }}
-            RELEASE_NAME="Release ${{ github.ref }}"
-            PRERELEASE=false
-          fi
-          echo "GIT_HASH=$GIT_HASH" >> $GITHUB_ENV
-          echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
-          echo "RELEASE_NAME=$RELEASE_NAME" >> $GITHUB_ENV
-          echo "PRERELEASE=$PRERELEASE" >> $GITHUB_ENV
-          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
-          cd $GITHUB_WORKSPACE
-          make prepare
-
-      - name: Build Hi3536Dv100 firmware
-        id: build-hi3536dv100-firmware
-        continue-on-error: true
-        run: |
-          ARCHIVE_FW="${GITHUB_WORKSPACE}/output/images/openipc.hi3536dv100-br.tgz"
-          echo "ARCHIVE_FW=$ARCHIVE_FW" >> $GITHUB_ENV
-          cd $GITHUB_WORKSPACE
-          make PLATFORM=hisilicon BOARD=unknown_unknown_hi3536dv100_openipc all
-          [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) -gt 2097152 ]] && echo "TG_NOTIFY=Warning, kernel size exceeded : $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/uImage) vs 2097152... Hi3536Dv100" >> $GITHUB_ENV && exit 1
-          [[ $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) -gt 5242880 ]] && echo "TG_NOTIFY=Warning, rootfs size exceeded - $(stat --printf="%s" ${GITHUB_WORKSPACE}/output/images/rootfs.squashfs) vs 5242880... Hi3536Dv100" >> $GITHUB_ENV && exit 1
-          cd ${GITHUB_WORKSPACE}/output/images
-          mv uImage uImage.hi3536dv100
-          mv rootfs.squashfs rootfs.squashfs.hi3536dv100
-          md5sum rootfs.squashfs.hi3536dv100 > rootfs.squashfs.hi3536dv100.md5sum
-          md5sum uImage.hi3536dv100 > uImage.hi3536dv100.md5sum
-          tar -cvzf $ARCHIVE_FW *hi3536dv100*
-
-      - name: Build Hi3536Dv100 SDK
-        id: build-hi3536dv100-sdk
-        continue-on-error: true
-        run: |
-          ARCHIVE_SDK="${GITHUB_WORKSPACE}/output/images/arm-openipc-linux-musleabi_sdk-buildroot.tar.gz"
-          echo "ARCHIVE_SDK=$ARCHIVE_SDK" >> $GITHUB_ENV
-          cd $GITHUB_WORKSPACE/output
-          make sdk
-
-      - name: Send error message to telegram channel
-        env:
-          TG_TOKEN: ${{ secrets.TELEGRAM_TOKEN_BOT_OPENIPC }}
-          TG_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL_OPENIPC_DEV }}
-        if: steps.build-hi3536dv100-firmware.outcome != 'success' || steps.build-hi3536dv100-sdk.outcome != 'success'
-        run: |
-          TG_OPTIONS="-s --connect-timeout 30 --max-time 30"
-          TG_NOTIFY="${TG_NOTIFY:=Warning, Buildroot compiling error... Hi3536Dv100}"
-          TG_HEADER=$(echo -e "\r\n$TG_NOTIFY \r\n\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH_NAME \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9A\xA0 GitHub Actions")
-          curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendMessage \
-            -F chat_id=$TG_CHANNEL -F text="$TG_HEADER"
-          exit 2
-
-      - name: Create release
-        if: ${{ !env.ACT }}
-        uses: actions/create-release@v1
-        continue-on-error: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ env.TAG_NAME }}
-          release_name: ${{ env.RELEASE_NAME }}
-          draft: false
-          prerelease: ${{ env.PRERELEASE }}
-
-      - name: Upload NOR FW to release
-        if: ${{ !env.ACT }}
-        uses: svenstaro/upload-release-action@v2
-        continue-on-error: true
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ env.ARCHIVE_FW }}
-          asset_name: "openipc.hi3536dv100-br.tgz"
-          tag: ${{ env.TAG_NAME }}
-          overwrite: true
-
-      - name: Upload SDK to release
-        if: ${{ !env.ACT }}
-        uses: svenstaro/upload-release-action@v2
-        continue-on-error: true
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ env.ARCHIVE_SDK }}
-          asset_name: "arm-openipc-hi3536dv100-linux-musleabi_sdk-buildroot.tar.gz"
-          tag: ${{ env.TAG_NAME }}
-          overwrite: true
-
-      - name: Send binary file to telegram channel
-        if: ${{ !env.ACT }}
-        env:
-          TG_TOKEN: ${{ secrets.TELEGRAM_TOKEN_BOT_OPENIPC }}
-          TG_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL_OPENIPC_DEV }}
-        run: |
-          TG_OPTIONS="-s --connect-timeout 30 --max-time 30"
-          TG_HEADER=$(echo -e "\r\nCommit: $GIT_HASH \r\nBranch: $BRANCH_NAME \r\nTag: $TAG_NAME \r\n\r\n\xE2\x9C\x85 GitHub Actions")
-          curl $TG_OPTIONS -H "Content-Type: multipart/form-data" -X POST https://api.telegram.org/bot$TG_TOKEN/sendDocument \
-            -F chat_id=$TG_CHANNEL -F document="@$ARCHIVE_FW" -F caption="$TG_HEADER"
diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml
index 3d3ee855..ce417769 100644
--- a/.github/workflows/matrix_build.yml
+++ b/.github/workflows/matrix_build.yml
@@ -162,6 +162,7 @@ jobs:
           - hi3516ev300
           - hi3518ev300
           - hi3516dv200
+          - hi3536dv100
           - gk7205v200
           - gk7205v210
           - gk7205v300
@@ -222,6 +223,8 @@ jobs:
             release: ultimate
           - platform: hi3516dv200
             release: ultimate
+          - platform: hi3536dv100
+            release: ultimate
           - platform: gk7605v100
             release: ultimate
           - platform: gk7205v210