diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 098e555e8e..c3f3f094be 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -11,6 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+      SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
+      SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
 
     services:
       rabbitmq:
@@ -36,9 +38,11 @@ jobs:
       - name: Check file license headers
         run: mvn license:check --batch-mode
 
-      - name: Run tests & javadoc
-        run: mvn verify javadoc:javadoc --batch-mode
-#
-#      - name: Scan (Sonar)
+#      - name: Run tests & javadoc
+#        if: ${{ BRANCH_NAME != 'master' }}
+#        run: mvn verify javadoc:javadoc --batch-mode
+
+      - name: Run tests & javadoc & Scan (Sonar)
 #        if: ${{ BRANCH_NAME == 'master' }}
-#        run: mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.branch.name=eclipse-master -Dsonar.login=$SONAR_ACCESS_TOKEN --batch-mode
+        run: mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.branch.name=eclipse-master -Dsonar.login=$SONARCLOUD_TOKEN --batch-mode
+#        run: mvn verify javadoc:javadoc org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=bir-eclipse-hawkbit --batch-mode