diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 16fe5ca9ae..303513f1bf 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -14,42 +14,17 @@ env:
     ~/.rustup
 
 jobs:
-#  Minideb-self-hosted:
-#    #if: ${{ github.ref == 'refs/heads/master' || startsWith( github.ref, 'refs/tags/') || contains( github.event.pull_request.labels.*.name, 'Non-master self-hosted') }}
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        options:
-#          - name: "Self-hosted: Minideb: Build Debug"
-#            build-type: "Debug"
-#          - name: "Self-hosted: Minideb: Build Release"
-#            build-type: "Release"
-#    name: "${{ matrix.options.name }}"
-#    runs-on: [ actions-runner-controller ]
-#    container: qdrvm/kagome-dev@sha256:2d70246c32418a3dd45c246d3f5c2dd99bdafde145b903271849affe476c4cfc
-#    steps:
-#      - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
-#      - uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
-#        with:
-#          path: ${{ env.CACHE_PATHS }}
-#          key: ${{ github.job }}-${{ matrix.options.name }}-${{ env.CACHE_VERSION }}
-#      - name: "${{ matrix.options.name }}"
-#        env:
-#          BUILD_TYPE: "${{ matrix.options.build-type }}"
-#        run: ./housekeeping/docker/kagome-dev/make.sh
-  Push-self-hosted:
-    #if: ${{ github.ref == 'refs/heads/master' || startsWith( github.ref, 'refs/tags/' ) }}
-    #needs: [clang-tidy, MacOS, Minideb-self-hosted]
+  Minideb-self-hosted:
+    #if: ${{ github.ref == 'refs/heads/master' || startsWith( github.ref, 'refs/tags/') || contains( github.event.pull_request.labels.*.name, 'Non-master self-hosted') }}
     strategy:
       fail-fast: false
       matrix:
         options:
-          - name: "Self-hosted: Push Debug Docker image"
+          - name: "Self-hosted: Minideb: Build Debug"
             build-type: "Debug"
-#          - name: "Self-hosted: Push Release Docker image"
+#          - name: "Self-hosted: Minideb: Build Release"
 #            build-type: "Release"
-#          - name: "Self-hosted: Push RelWithDebInfo Docker image"
-#            build-type: "RelWithDebInfo"
+    name: "${{ matrix.options.name }}"
     runs-on: [ actions-runner-controller ]
     container: qdrvm/kagome-dev@sha256:2d70246c32418a3dd45c246d3f5c2dd99bdafde145b903271849affe476c4cfc
     steps:
@@ -57,20 +32,64 @@ jobs:
       - uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
         with:
           path: ${{ env.CACHE_PATHS }}
-          key: ${{ github.job }}-${{ env.CACHE_VERSION }}
-      - run: git config --global --add safe.directory /__w/kagome/kagome
-      - run: git fetch --prune --unshallow
-      - name: build
+          key: ${{ github.job }}-${{ matrix.options.name }}-${{ env.CACHE_VERSION }}
+      - name: "${{ matrix.options.name }}"
         env:
           BUILD_TYPE: "${{ matrix.options.build-type }}"
         run: ./housekeeping/docker/kagome-dev/make.sh
-      - uses: azure/docker-login@83efeb77770c98b620c73055fbb59b2847e17dc0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
         with:
-          login-server: https://index.docker.io/v1/
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
-      - name: docker pack and push
-        env:
-          VERSION: ${{ github.ref }}
-          BUILD_TYPE: "${{ matrix.options.build-type }}"
-        run: ./housekeeping/docker/kagome/build_and_push_test.sh
\ No newline at end of file
+      - name: Build and Push Docker Image
+        uses: docker/build-push-action@v2
+        with:
+          context: /__w/kagome/kagome/build/docker_context
+          file: ./housekeeping/docker/kagome/minideb-debug.Dockerfile
+          push: true
+          tags: qdrvm/kagome-ci-test:${{ github.ref_name }}-${{ matrix.options.build-type }}
+          build-args: |
+            BUILD_TYPE=${{ matrix.options.build-type }}
+            VERSION=${{ github.ref_name }}
+
+#  Push-self-hosted:
+#    #if: ${{ github.ref == 'refs/heads/master' || startsWith( github.ref, 'refs/tags/' ) }}
+#    #needs: [clang-tidy, MacOS, Minideb-self-hosted]
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        options:
+#          - name: "Self-hosted: Push Debug Docker image"
+#            build-type: "Debug"
+##          - name: "Self-hosted: Push Release Docker image"
+##            build-type: "Release"
+##          - name: "Self-hosted: Push RelWithDebInfo Docker image"
+##            build-type: "RelWithDebInfo"
+#    runs-on: [ actions-runner-controller ]
+#    container: qdrvm/kagome-dev@sha256:2d70246c32418a3dd45c246d3f5c2dd99bdafde145b903271849affe476c4cfc
+#    steps:
+#      - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
+#      - uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
+#        with:
+#          path: ${{ env.CACHE_PATHS }}
+#          key: ${{ github.job }}-${{ env.CACHE_VERSION }}
+#      - run: git config --global --add safe.directory /__w/kagome/kagome
+#      - run: git fetch --prune --unshallow
+#      - name: build
+#        env:
+#          BUILD_TYPE: "${{ matrix.options.build-type }}"
+#        run: ./housekeeping/docker/kagome-dev/make.sh
+#      - uses: azure/docker-login@83efeb77770c98b620c73055fbb59b2847e17dc0
+#        with:
+#          login-server: https://index.docker.io/v1/
+#          username: ${{ secrets.DOCKER_USERNAME }}
+#          password: ${{ secrets.DOCKER_TOKEN }}
+#      - name: docker pack and push
+#        env:
+#          VERSION: ${{ github.ref }}
+#          BUILD_TYPE: "${{ matrix.options.build-type }}"
+#        run: ./housekeeping/docker/kagome/build_and_push_test.sh
\ No newline at end of file