diff --git a/.github/workflows/f5-cla.yml b/.github/workflows/f5-cla.yml
index fbf680ea..72e71f2e 100644
--- a/.github/workflows/f5-cla.yml
+++ b/.github/workflows/f5-cla.yml
@@ -1,4 +1,4 @@
-name: "F5 Contributor License Agreement"
+name: F5 CLA
 on:
   issue_comment:
     types: [created]
@@ -7,27 +7,33 @@ on:
 
 permissions:
   actions: write
-  contents: write
   pull-requests: write
   statuses: write
 
 jobs:
-  cla:
-    runs-on: ubuntu-latest
+  f5-cla:
+    runs-on: ubuntu-22.04
     steps:
-      - name: "CLA Assistant"
+      - name: Run F5 Contributor License Agreement (CLA) assistant
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have hereby read the F5 CLA and agree to its terms') || github.event_name == 'pull_request_target'
-        uses: contributor-assistant/github-action@v2.3.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PERSONAL_ACCESS_TOKEN: ${{ secrets.F5_CLA_TOKEN }}
+        uses: contributor-assistant/github-action@dbc1c64d82d3aad5072007a41fff2828ae6d23ec # v2.3.2
         with:
-          path-to-signatures: 'signatures/beta/signatures.json'
+          # Any pull request targeting the following branch will trigger a CLA check.
+          branch: 'main'
+          # Path to the CLA document.
           path-to-document: 'https://github.com/f5/.github/blob/main/CLA/cla-markdown.md'
-          branch: 'master'
+          # Custom CLA messages.
+          custom-notsigned-prcomment: '🎉 Thank you for your contribution. It appears you have not yet signed the F5 Contributor License Agreement (CLA), which is required for your changes to be incorporated into an F5 project. Please kindly read the [F5 CLA](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md) and comment the following to agree:'
           custom-pr-sign-comment: 'I have hereby read the F5 CLA and agree to its terms'
-          custom-notsigned-prcomment: '🎉 Thank you for your contribution. It appears you have not yet signed the F5 Contributor License Agreement, which is required for your changes to be incorporated into an F5 project. Please kindly read the [F5 CLA](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md) and comment the following to agree:'
-          custom-allsigned-prcomment: 'All required contributors have signed the F5 CLA for this PR  ✅'
+          custom-allsigned-prcomment: '✅ All required contributors have signed the F5 CLA for this PR. Thank you!'
+          # Remote repository storing CLA signatures.
           remote-organization-name: 'f5'
           remote-repository-name: 'f5-cla-data'
-          allowlist: 4141done, dekobon, bot*
\ No newline at end of file
+          path-to-signatures: 'signatures/beta/signatures.json'
+          # Comma separated list of usernames for maintainers or any other individuals who should not be prompted for a CLA.
+          allowlist: 4141done, dekobon, bot*
+          # Do not lock PRs after a merge.
+          lock-pullrequest-aftermerge: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PERSONAL_ACCESS_TOKEN: ${{ secrets.F5_CLA_TOKEN }}