diff --git a/.github/workflows/evaluate.yaml b/.github/workflows/evaluate.yaml
index 80971b0a..b805ce3f 100644
--- a/.github/workflows/evaluate.yaml
+++ b/.github/workflows/evaluate.yaml
@@ -15,6 +15,7 @@ permissions:
 jobs:
   evaluate:
     if: |
+      contains('["OWNER", "CONTRIBUTOR", "COLLABORATOR", "MEMBER"]', github.event.comment.author_association) &&
       github.event.issue.pull_request &&
       github.event.comment.body == '/evaluate'
     runs-on: ubuntu-latest
@@ -87,7 +88,7 @@ jobs:
           cache-dependency-glob: "requirements**.txt"
 
       - name: Install azd
-        uses: Azure/setup-azd@v1.0.0
+        uses: Azure/setup-azd@v2.0.0
 
       - name: Login to Azure
         uses: azure/login@v2