diff --git a/.github/workflows/issue-comment.yaml b/.github/workflows/issue-comment.yaml
deleted file mode 100644
index b2ad6bc4..00000000
--- a/.github/workflows/issue-comment.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: Handle Issue Comment
-
-on:
-  issue_comment:
-
-jobs:
-  reconcile-issue-comment:
-    secrets: inherit
-    uses: konveyor/release-tools/.github/workflows/reconcile-issue-comment.yaml@main
diff --git a/.github/workflows/issue.yaml b/.github/workflows/issue.yaml
deleted file mode 100644
index 8608896d..00000000
--- a/.github/workflows/issue.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Reconcile GitHub Issue
-
-on:
-  issues:
-    types:
-      - opened
-      - edited
-      - closed
-      - reopened
-      - labeled
-      - unlabeled
-
-# This prevents potential race conditions by only allowing this action to handle
-# one update at a time for a given issue.
-concurrency:
-  group: reconcile-issue-${{ github.event.issue.number }}
-  cancel-in-progress: true
-
-jobs:
-  reconcile-issue:
-    secrets: inherit
-    uses: konveyor/release-tools/.github/workflows/reconcile-issue.yaml@main
diff --git a/.github/workflows/issues.yaml b/.github/workflows/issues.yaml
new file mode 100644
index 00000000..0c4207d7
--- /dev/null
+++ b/.github/workflows/issues.yaml
@@ -0,0 +1,26 @@
+name: Reconcile GitHub Issue (Comment)
+
+on:
+  issues:
+    types:
+      - opened
+      - edited
+      - closed
+      - reopened
+      - labeled
+      - unlabeled
+  issue_comment:
+    types:
+      - created
+      - edited
+
+jobs:
+  reconcile-issue:
+    if: github.event_name == 'issues' || github.event_name == 'pull_request'
+    secrets: inherit
+    uses: konveyor/release-tools/.github/workflows/reconcile-issue.yaml@main
+
+  reconcile-issue-comment:
+    if: github.event_name == 'issue_comment'
+    secrets: inherit
+    uses: konveyor/release-tools/.github/workflows/reconcile-issue-comment.yaml@main