diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 1591639c1379..62ec70ede9d6 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -58,7 +58,7 @@ jobs:
         run: |
           cat apps/ledger-live-desktop/coverage/lld-sonar-executionTests-report.xml > ./lld-sonar-executionTests-report.xml
           cat apps/ledger-live-mobile/coverage/llm-sonar-executionTests-report.xml > ./llm-sonar-executionTests-report.xml
-      - uses: sonarsource/sonarqube-scan-action@master
+      - name: SonarQube Scan
+        uses: sonarsource/sonarcloud-github-action@master
         env:
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
\ No newline at end of file
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
\ No newline at end of file
diff --git a/sonar-project.properties b/sonar-project.properties
index 757780edafe9..e01db1edb50c 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,8 +1,13 @@
-sonar.projectKey=LedgerHQ_ledger-live_AZKKhf387xkLuPYwRra5
+sonar.projectKey=LedgerHQ_ledger-live
 sonar.projectName=ledger-live
 sonar.sourceEncoding=UTF-8
 sonar.sources=apps,libs
 sonar.exclusions=.pnpm/**,**/node_modules/**,**/*.java,**/.turbo,**/.webpack/**/*,**/jest.config.js,**/jest.config.ts,**/jest-setup.js,**/jestSetup.js,**/jest-global-setup.js,**/please-add-coverage.test.ts,**/jest.integ.config.js,**/deeplinks-test-page.html,**/babel.config.js,**/detox.config.js,**/metro.config.js,apps/ledger-live-mobile/react-native.config,**/fileMock.js,**/jest.polyfills.js,apps/ledger-live-desktop/tests/**,apps/ledger-live-mobile/tests/**,apps/ledger-live-desktop/scripts/**,**/__mocks__/**,**/__tests__/**,**/e2e/**,**/types.ts,**/*.esbuild.js,**/*.mjs,**/constants.ts,**/enums.ts,apps/ledger-live-desktop/tools/**
 sonar.javascript.lcov.reportPaths=lcov.info
 sonar.testExecutionReportPaths=lld-sonar-executionTests-report.xml,llm-sonar-executionTests-report.xml
-sonar.typescript.tsconfigPaths=tsconfig.base.json,**/tsconfig.json
\ No newline at end of file
+sonar.typescript.tsconfigPaths=tsconfig.base.json,apps/**/tsconfig.json
+sonar.organization=ledger
+sonar.javascript.node.maxspace=16384
+sonar.c.file.suffixes=-
+sonar.cpp.file.suffixes=-
+sonar.objc.file.suffixes=-
\ No newline at end of file