diff --git a/.github/workflows/issue-commented.yml b/.github/workflows/issue-commented.yml
new file mode 100644
index 000000000000..40a38d73ea41
--- /dev/null
+++ b/.github/workflows/issue-commented.yml
@@ -0,0 +1,23 @@
+name: Issue Commented
+
+on:
+  issue_comment:
+    types:
+      - created
+
+permissions:
+  contents: read
+
+jobs:
+  issue-commented:
+    permissions:
+      issues: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Remove blocked/need-repro on comment
+        if: ${{ contains(github.event.issue.labels.*.name, 'blocked/need-repro') && !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE_URL: ${{ github.event.issue.html_url }}
+        run: |
+          gh issue edit $ISSUE_URL --remove-label 'blocked/need-repro'
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index a908512935a6..d14c3f6a1a5b 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -33,6 +33,7 @@ jobs:
         with:
           days-before-stale: -1
           days-before-close: 10
+          remove-stale-when-updated: false
           stale-issue-label: blocked/need-repro
           stale-pr-label: not-a-real-label
           operations-per-run: 1750