diff --git a/.github/workflows/issue-management-feedback-label.yml b/.github/workflows/issue-management-feedback-label.yml
new file mode 100644
index 00000000000..fe3c9aa2e4d
--- /dev/null
+++ b/.github/workflows/issue-management-feedback-label.yml
@@ -0,0 +1,21 @@
+name: Issue management - remove needs feedback label
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  issue_comment:
+    if: >
+      contains(github.event.issue.labels.*.name, 'needs author feedback') &&
+      github.event.comment.user.login == github.event.issue.user.login
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Remove label
+        env:
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh issue edit --remove-label "needs author feedback" $ISSUE_NUMBER
diff --git a/.github/workflows/issue-management-stale-action.yml b/.github/workflows/issue-management-stale-action.yml
new file mode 100644
index 00000000000..18f80c1960e
--- /dev/null
+++ b/.github/workflows/issue-management-stale-action.yml
@@ -0,0 +1,25 @@
+name: Issue management - run stale action
+
+on:
+  schedule:
+    # hourly at minute 23
+    - cron: "23 * * * *"
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v8
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-stale: 7
+          days-before-close: 7
+          only-labels: "needs author feedback"
+          stale-issue-message: >
+            This has been automatically marked as stale because it has been marked
+            as needing author feedback and has not had any activity for 7 days.
+            It will be closed if no further activity occurs within 7 days of this comment.
+          stale-pr-message: >
+            This has been automatically marked as stale because it has been marked
+            as needing author feedback and has not had any activity for 7 days.
+            It will be closed if no further activity occurs within 7 days of this comment.
diff --git a/.github/workflows/stale-pr.yml b/.github/workflows/stale-pr.yml
deleted file mode 100644
index 4f91ce57626..00000000000
--- a/.github/workflows/stale-pr.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: "Close stale pull requests"
-on:
-  schedule:
-    - cron: "23 * * * *" # https://crontab.guru/#23_*_*_*_*
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v8
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          stale-pr-message: 'This PR was marked stale due to lack of activity. It will be closed in 14 days.'
-          close-pr-message: 'Closed as inactive. Feel free to reopen if this PR is still being worked on.'
-          days-before-pr-stale: 14
-          days-before-pr-close: 14
-          exempt-pr-labels: prototype
-          any-of-issue-labels: needs-author-feedback
-          days-before-issue-stale: 7
-          days-before-issue-close: 7
-          stale-issue-message: 'This issue was marked stale due to lack of author feedback. It will be closed in 7 days.'
-          close-issue-message: 'Closed as inactive. Feel free to reopen if this issue is still being worked on.'