diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 95d2794e..acd0e644 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -81,7 +81,7 @@ jobs:
         run: ./gradlew assembleDebug
 
       - name: Run SonarCloud Analysis
-        uses: sonarsource/sonarcloud-github-action@latest
+        uses: sonarsource/sonarcloud-github-action@master
         with:
-          organization: 'cko-mobile'
-          token: ${{ secrets.SONAR_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GHA_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}