diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index 2c3839b0..cfd557d5 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -3,7 +3,7 @@ on:
   issue_comment:
     types: [created]
   pull_request_target:
-    types: [opened,closed,synchronize]
+    types: [opened, closed, synchronize]
 
 jobs:
   CLAAssistant:
@@ -14,45 +14,48 @@ jobs:
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.PRIVATE_KEY }}
-    
+
       - name: "CLA Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        # Beta Release
+        if: >
+          (github.event_name == 'issue_comment' && contains(github.event.comment.body || '', 'recheck')) ||
+          (github.event_name == 'issue_comment' && contains(github.event.comment.body || '', 'I have read the CLA Document and I hereby sign the CLA')) ||
+          github.event_name == 'pull_request_target'
         uses: contributor-assistant/github-action@v2.6.1
         env:
           GITHUB_TOKEN: ${{ steps.create_token.outputs.token }}
-          # the below token should have repo scope and must be manually added by you in the repository's secret
           PERSONAL_ACCESS_TOKEN: ${{ steps.create_token.outputs.token }}
         with:
           path-to-signatures: 'signatures-v3.json'
-          path-to-document: 'https://github.com/open-domains/register/blob/main/terms.md' # e.g. a CLA or a DCO document
-          # branch should not be protected
+          path-to-document: 'https://github.com/open-domains/register/blob/main/terms.md'
           branch: 'main'
           allowlist: od-bot,bot*,kyro3400
           remote-organization-name: 'open-domains'
           remote-repository-name: 'cla'
           lock-pullrequest-aftermerge: false
 
-      - name: add CLA signed
+      - name: Add CLA Signed
         uses: actions-ecosystem/action-add-labels@v1
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+        if: >
+          (github.event_name == 'issue_comment' && contains(github.event.comment.body || '', 'recheck')) ||
+          (github.event_name == 'issue_comment' && contains(github.event.comment.body || '', 'I have read the CLA Document and I hereby sign the CLA')) ||
+          github.event_name == 'pull_request_target'
         with:
           labels: "CLA Signed"
           github_token: ${{ steps.create_token.outputs.token }}
 
-      - name: remove CLA required
+      - name: Remove CLA Required
         uses: actions-ecosystem/action-remove-labels@v1
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+        if: >
+          (github.event_name == 'issue_comment' && contains(github.event.comment.body || '', 'recheck')) ||
+          (github.event_name == 'issue_comment' && contains(github.event.comment.body || '', 'I have read the CLA Document and I hereby sign the CLA')) ||
+          github.event_name == 'pull_request_target'
         with:
           labels: "CLA Required"
-          github_token: ${{ steps.create_token.outputs.token }}    
+          github_token: ${{ steps.create_token.outputs.token }}
 
-      - if: ${{ failure() }}
-        name: Add CLA required
+      - name: Add CLA Required on Failure
+        if: ${{ failure() }}
         uses: actions-ecosystem/action-add-labels@v1
         with:
           labels: "CLA Required"
           github_token: ${{ steps.create_token.outputs.token }}
-          
-
-