diff --git a/.circleci/config.yml b/.circleci/config.yml
index e6711151..5fef25d9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -90,29 +90,34 @@ commands:
     steps:
       - attach_workspace:
           at: .
-      - run:
-          name: Install Java
-          command: |
-            sudo apt-get update
-            sudo apt-get install openjdk-11-jdk
       - run:
           name: Run SonarQube to report the coverage
           command: |
+            python -m venv venv
             . venv/bin/activate
+            
+            pip install --upgrade pip coverage
             coverage combine ./coverage_results
             coverage xml -i
-            wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.8.1.3023.zip
-            unzip -d /tmp /tmp/sonar-scanner-cli.zip
-            if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
-              /tmp/sonar-scanner-4.8.1.3023/bin/sonar-scanner \
-                -Dsonar.host.url=${SONARQUBE_URL} \
-                -Dsonar.login="${SONARQUBE_LOGIN}" \
-                -Dsonar.pullrequest.key="${CIRCLE_PR_NUMBER}" \
+
+            PR_NUMBER=$(echo ${CIRCLE_PULL_REQUEST} | sed 's/.*\///')
+            SONAR_TOKEN=${SONAR_TOKEN}
+
+            pip install --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ pysonar-scanner
+            export SONAR_SCANNER_OPTS="-server"
+            
+            if [[ -n "${PR_NUMBER}" ]]; then
+              pysonar-scanner \
+                -Dsonar.organization=instana \
+                -Dsonar.projectKey=instana_python-sensor \
+                -Dsonar.host.url="${SONARQUBE_URL}" \
+                -Dsonar.pullrequest.key="${PR_NUMBER}" \
                 -Dsonar.pullrequest.branch="${CIRCLE_BRANCH}"
             else
-              /tmp/sonar-scanner-4.8.1.3023/bin/sonar-scanner \
-                -Dsonar.host.url=${SONARQUBE_URL} \
-                -Dsonar.login="${SONARQUBE_LOGIN}" \
+              pysonar-scanner \
+                -Dsonar.organization=instana \
+                -Dsonar.projectKey=instana_python-sensor \
+                -Dsonar.host.url="${SONARQUBE_URL}" \
                 -Dsonar.branch.name="${CIRCLE_BRANCH}"
             fi
       - store_artifacts:
@@ -286,15 +291,12 @@ jobs:
 
   final_job:
     docker:
-      - image: public.ecr.aws/docker/library/python:3.9
+      - image: public.ecr.aws/docker/library/python:3.13
     working_directory: ~/repo
     steps:
       - checkout
       - check-if-tests-needed
-      - pip-install-deps
-      - pip-install-tests-deps
-      - store-pytest-results
-      # - run_sonarqube
+      - run_sonarqube
 
 workflows:
   tests:
diff --git a/sonar-project.properties b/sonar-project.properties
index 56b3d211..b373d6be 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,11 +1,10 @@
-sonar.projectKey=Python-Tracer
-sonar.projectName=Python Tracer
+sonar.projectKey=instana_python-sensor
+sonar.organization=instana
+sonar.projectName=python-sensor
 sonar.sourceEncoding=utf-8
 sonar.sources=src/instana/
-sonar.tests=tests/
 sonar.python.coverage.reportPaths=coverage.xml
 sonar.python.version=3
 sonar.links.homepage=https://github.com/instana/python-sensor/
 sonar.links.ci=https://circleci.com/gh/instana/python-sensor
 sonar.links.issue=https://github.com/instana/python-sensor/issues
-sonar.links.scm=https://github.com/instana/python-sensor/