diff --git a/.github/workflows/_docker-build.yml b/.github/workflows/_docker-build.yml
index b193e11..1b514be 100644
--- a/.github/workflows/_docker-build.yml
+++ b/.github/workflows/_docker-build.yml
@@ -73,14 +73,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      # TODO(shink): Improve files once this PR merged
-      # https://github.com/docker/bake-action/pull/247
       - name: List targets
         id: list-target
-        uses: docker/bake-action/subaction/list-targets@v5
+        uses: docker/bake-action/subaction/list-targets@v6
         with:
-          files: arg.json,docker-bake.hcl
           target: ${{ inputs.target }}
+          files: |
+            arg.json
+            docker-bake.hcl
 
   docker:
     name: 'docker'
@@ -127,8 +127,9 @@ jobs:
 
       - name: Build and push Docker image
         id: bake
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             ${{ github.workspace }}/arg.json
             ${{ github.workspace }}/docker-bake.hcl
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c22b048..7f429a5 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -72,7 +72,7 @@ jobs:
     name: python
     needs:
       - prepare
-    if: ${{ github.event_name != 'pull_request' || (always() && contains(needs.prepare.outputs.pr-labels, 'python')) }}
+    if: ${{ github.event_name != 'pull_request' || (!cancelled() && contains(needs.prepare.outputs.pr-labels, 'python')) }}
     uses: ./.github/workflows/_docker-build.yml
     with:
       target: 'python'
@@ -88,7 +88,7 @@ jobs:
     needs:
       - prepare
       - python
-    if: ${{ github.event_name != 'pull_request' || (always() && contains(needs.prepare.outputs.pr-labels, 'cann')) }}
+    if: ${{ github.event_name != 'pull_request' || (!cancelled() && contains(needs.prepare.outputs.pr-labels, 'cann')) }}
     uses: ./.github/workflows/_docker-build.yml
     with:
       target: 'cann'
@@ -100,7 +100,7 @@ jobs:
     needs:
       - prepare
       - cann
-    if: ${{ github.event_name != 'pull_request' || (always() && contains(needs.prepare.outputs.pr-labels, 'pytorch')) }}
+    if: ${{ github.event_name != 'pull_request' || (!cancelled() && contains(needs.prepare.outputs.pr-labels, 'pytorch')) }}
     uses: ./.github/workflows/_docker-build.yml
     with:
       target: 'pytorch'
@@ -112,7 +112,7 @@ jobs:
     needs:
       - prepare
       - cann
-    if: ${{ github.event_name != 'pull_request' || (always() && contains(needs.prepare.outputs.pr-labels, 'mindspore')) }}
+    if: ${{ github.event_name != 'pull_request' || (!cancelled() && contains(needs.prepare.outputs.pr-labels, 'mindspore')) }}
     uses: ./.github/workflows/_docker-build.yml
     with:
       target: 'mindspore'