diff --git a/.github/workflows/build-action.yml b/.github/workflows/build-action.yml
index cc824f50..0d31cdfa 100644
--- a/.github/workflows/build-action.yml
+++ b/.github/workflows/build-action.yml
@@ -5,9 +5,8 @@ on:
       - main
     paths:
       - .github/action/**
+      - "!.github/action/dist/**"
       - .github/workflows/build-action.yml
-    paths-ignore:
-      - .github/action/dist/**
 permissions:
   contents: write
   pull-requests: write
@@ -30,7 +29,7 @@ jobs:
       - uses: peter-evans/create-pull-request@v6
         env:
           COMMIT_MESSAGE: |
-            Update .github/action built by GitHub Actions Workflow "${{ github.workflow }}" run ${{ github.server_url }}/${{ github.repository }}/actions/${{ github.run_id }} for user ${{ github.actor }} from commit ${{ github.sha }}.
+            Update [.github/action](.github/action) built by GitHub Actions Workflow "${{ github.workflow }}" run ${{ github.server_url }}/${{ github.repository }}/actions/${{ github.run_id }} for user ${{ github.actor }} from commit ${{ github.sha }}.
         with:
           add-paths: |
             .github/action
diff --git a/.github/workflows/build-shims.yml b/.github/workflows/build-shims.yml
index 9b1e1302..35fc4c2a 100644
--- a/.github/workflows/build-shims.yml
+++ b/.github/workflows/build-shims.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: peter-evans/create-pull-request@v6
         env:
           COMMIT_MESSAGE: |
-            Update internal/bin/shim_amd64 and internal/bin/shim_arm64 built by GitHub Actions Workflow "${{ github.workflow }}" run ${{ github.server_url }}/${{ github.repository }}/actions/${{ github.run_id }} for user ${{ github.actor }} from commit ${{ github.sha }}.
+            Update [internal/bin/shim_*](internal/bin) built by GitHub Actions Workflow "${{ github.workflow }}" run ${{ github.server_url }}/${{ github.repository }}/actions/${{ github.run_id }} for user ${{ github.actor }} from commit ${{ github.sha }}.
         with:
           add-paths: |
             internal/bin/shim_amd64
@@ -31,7 +31,7 @@ jobs:
           reviewers: |
             ${{ github.actor }}
           title: |
-            Build internal/bin/shim_amd64 and internal/bin/shim_arm64
+            Build internal/bin/shim_*
           commit-message: ${{ env.COMMIT_MESSAGE }}
           body: ${{ env.COMMIT_MESSAGE }}
           branch: github-actions/gen/internal/bin