diff --git a/.github/workflows/recipe-catalog-change-cleanup.yaml b/.github/workflows/recipe-catalog-change-cleanup.yaml
new file mode 100644
index 000000000..5910be838
--- /dev/null
+++ b/.github/workflows/recipe-catalog-change-cleanup.yaml
@@ -0,0 +1,35 @@
+name: recipe-catalog-change-cleanup
+
+on:
+  workflow_run:
+    workflows: ["recipe-catalog-change-windows-trigger"]
+    types:
+      - completed
+
+jobs:
+  debug:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Debug context
+        run: |
+          echo "Workflow run ID: ${{ github.event.workflow_run.id }}"
+          echo "Fork owner: ${{ github.event.workflow_run.head_repository.owner.login }}"
+          echo "Fork repo: ${{ github.event.workflow_run.head_repository.name }}"
+          echo "Fork branch: ${{ github.event.workflow_run.head_branch }}"
+          echo "Commit SHA: ${{ github.event.workflow_run.head_sha }}"
+          echo "Base repo: ${{ github.event.workflow_run.repository.full_name }}"
+          echo "Changes detected: ${{ github.event.workflow_run.outputs.changes-detected }}"
+          echo "Conclusion: ${{ github.event.workflow_run.conclusion }}"
+          echo "Workflow context: ${{ toJson(github.event.workflow_run) }}"
+  cleanup:
+    runs-on: ubuntu-24.04
+    if: ${{ github.event.workflow_run.conclusion == 'skipped' || github.event.workflow_run.conclusion == 'cancelled' }}
+    steps:
+      - name: Remove skipped or cancelled workflow run
+        run: |
+          echo "Cleaning up workflow run ID: ${{ github.event.workflow_run.id }}"
+          gh run delete ${{ github.event.workflow_run.id }} --repo ${{ github.event.workflow_run.repository.full_name }}
+          echo "Workflow run ID ${{ github.event.workflow_run.id }} has been cleaned up."
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        continue-on-error: true
diff --git a/.github/workflows/recipe-catalog-change-trigger.yaml b/.github/workflows/recipe-catalog-change-trigger.yaml
index fb963949e..bfc8e71ca 100644
--- a/.github/workflows/recipe-catalog-change-trigger.yaml
+++ b/.github/workflows/recipe-catalog-change-trigger.yaml
@@ -49,7 +49,6 @@ jobs:
           else
             echo "No changes detected in ai.json"
             echo "changes-detected=false" >> $GITHUB_OUTPUT
-            gh run cancel ${{ github.run_id}}
           fi
 
   trigger-template: