diff --git a/.github/actions/setup-sonar-tools/action.yml b/.github/actions/setup-sonar-tools/action.yml
index 154824c70a..8e115ef2ec 100644
--- a/.github/actions/setup-sonar-tools/action.yml
+++ b/.github/actions/setup-sonar-tools/action.yml
@@ -3,9 +3,9 @@ description: Download and install sonar-scanner and build-wrapper
 runs:
   using: "composite"
   steps:
-    - run: echo "SONAR_SCANNER_VERSION=5.0.1.3006" >> $GITHUB_ENV
+    - run: echo "SONAR_SCANNER_VERSION=7.3.0.5189" >> $GITHUB_ENV
       shell: bash
-    - run: echo "SONAR_SCANNER_HOME=${HOME}/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux" >> $GITHUB_ENV
+    - run: echo "SONAR_SCANNER_HOME=${HOME}/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux-x64" >> $GITHUB_ENV
       shell: bash
     - run: echo "SONAR_SCANNER_OPTS=-server" >> $GITHUB_ENV
       shell: bash
@@ -19,7 +19,7 @@ runs:
         sudo apt-get update \
         && sudo apt-get install nodejs curl unzip \
         && curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip \
-          https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip \
+          https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux-x64.zip \
         && unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/ \
         && curl --create-dirs -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip \
           https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip \
diff --git a/.github/workflows/test_python_cplusplus.yml b/.github/workflows/test_python_cplusplus.yml
index 994944e2b2..fe70ddd8bd 100644
--- a/.github/workflows/test_python_cplusplus.yml
+++ b/.github/workflows/test_python_cplusplus.yml
@@ -51,6 +51,8 @@ jobs:
       run: scripts/run-cpp-tests.sh
 
     - name: Install python package
+      env:
+          CMAKE_EXPORT_COMPILE_COMMANDS: "ON"
       run: scripts/installAmiciSource.sh
 
     - name: Check OpenMP support
@@ -117,7 +119,7 @@ jobs:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       run: |
         sonar-scanner \
-         -Dsonar.cfamily.build-wrapper-output=bw-output \
+         -Dsonar.cfamily.compile-commands=bw-output/compile_commands.json \
          -Dsonar.projectVersion="$(git describe --abbrev=4 --dirty=-dirty --always --tags | tr -d '\n')"
 
   ubuntu-python-tests:
@@ -150,6 +152,8 @@ jobs:
       uses: ./.github/actions/setup-amici-cpp
 
     - name: Install python package
+      env:
+        CMAKE_EXPORT_COMPILE_COMMANDS: "ON"
       run: scripts/installAmiciSource.sh
 
     - name: Python tests
@@ -199,7 +203,7 @@ jobs:
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       run: |
         sonar-scanner \
-         -Dsonar.cfamily.build-wrapper-output=bw-output \
+         -Dsonar.cfamily.compile-commands=bw-output/compile_commands.json \
          -Dsonar.projectVersion="$(git describe --abbrev=4 --dirty=-dirty --always --tags | tr -d '\n')"