diff --git a/.github/workflows/openhands-resolver.yml b/.github/workflows/openhands-resolver.yml
index cedef39..02c06d5 100644
--- a/.github/workflows/openhands-resolver.yml
+++ b/.github/workflows/openhands-resolver.yml
@@ -41,7 +41,9 @@ jobs:
       github.event_name == 'workflow_call' ||
       github.event.label.name == 'fix-me' ||
       github.event.label.name == 'fix-me-experimental' ||
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, ${{ inputs.macro || '@openhands-agent' }}))
+      (github.event_name == 'issue_comment' && 
+       contains(github.event.comment.body, ${{ inputs.macro || '@openhands-agent' }}) &&
+       (github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'COLLABORATOR' || github.event.comment.author_association == 'MEMBER'))
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
diff --git a/examples/openhands-resolver.yml b/examples/openhands-resolver.yml
index b49b907..743d40b 100644
--- a/examples/openhands-resolver.yml
+++ b/examples/openhands-resolver.yml
@@ -18,7 +18,9 @@ jobs:
     uses: All-Hands-AI/openhands-resolver/.github/workflows/openhands-resolver.yml@main
     if: |
       github.event.label.name == 'fix-me' ||
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, ${{ inputs.macro || '@openhands-agent' }}))
+      (github.event_name == 'issue_comment' && 
+       contains(github.event.comment.body, ${{ inputs.macro || '@openhands-agent' }}) &&
+       (github.event.comment.author_association == 'OWNER' || github.event.comment.author_association == 'COLLABORATOR' || github.event.comment.author_association == 'MEMBER'))
     with:
       max_iterations: 50
       macro: "@openhands-agent"