diff --git a/.github/workflows/cla-reusable.yml b/.github/workflows/cla-reusable.yml
index b46eb9b..6da3b8b 100644
--- a/.github/workflows/cla-reusable.yml
+++ b/.github/workflows/cla-reusable.yml
@@ -136,9 +136,21 @@ jobs:
             core.setOutput("corporate_authorization_display_name", corporateAuthorizationDisplayName);
             core.setOutput("sign_comment", signComment);
 
+      - name: Detect GitHub App token configuration
+        id: detect_app_auth
+        run: |
+          if [ -n "${APP_ID}" ] && [ -n "${APP_PRIVATE_KEY}" ]; then
+            echo "enabled=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "enabled=false" >> "$GITHUB_OUTPUT"
+          fi
+        env:
+          APP_ID: ${{ inputs.app-id }}
+          APP_PRIVATE_KEY: ${{ secrets.CLA_APP_PRIVATE_KEY }}
+
       - name: Create GitHub App token
         id: app_token
-        if: ${{ inputs.app-id != '' && secrets.CLA_APP_PRIVATE_KEY != '' }}
+        if: ${{ steps.detect_app_auth.outputs.enabled == 'true' }}
         uses: actions/create-github-app-token@v2
         with:
           app-id: ${{ inputs.app-id }}
diff --git a/.github/workflows/pr-compliance-reusable.yml b/.github/workflows/pr-compliance-reusable.yml
index 089ae6d..c12cc24 100644
--- a/.github/workflows/pr-compliance-reusable.yml
+++ b/.github/workflows/pr-compliance-reusable.yml
@@ -33,9 +33,21 @@ jobs:
   validate-pr-metadata:
     runs-on: ubuntu-latest
     steps:
+      - name: Detect GitHub App token configuration
+        id: detect_app_auth
+        run: |
+          if [ -n "${APP_ID}" ] && [ -n "${APP_PRIVATE_KEY}" ]; then
+            echo "enabled=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "enabled=false" >> "$GITHUB_OUTPUT"
+          fi
+        env:
+          APP_ID: ${{ inputs.app-id }}
+          APP_PRIVATE_KEY: ${{ secrets.CLA_APP_PRIVATE_KEY }}
+
       - name: Create GitHub App token
         id: app_token
-        if: ${{ inputs.app-id != '' && secrets.CLA_APP_PRIVATE_KEY != '' }}
+        if: ${{ steps.detect_app_auth.outputs.enabled == 'true' }}
         uses: actions/create-github-app-token@v2
         with:
           app-id: ${{ inputs.app-id }}