diff --git a/.github/workflows/coverage-check.yml b/.github/workflows/coverage-check.yml
index 3c1c4ed6936..b72709eebca 100644
--- a/.github/workflows/coverage-check.yml
+++ b/.github/workflows/coverage-check.yml
@@ -91,7 +91,7 @@ jobs:
         run: |
           git clone https://github.com/shapeblue/cloudstack-nonoss.git nonoss
           cd nonoss && bash -x install-non-oss.sh && cd ..
-          mvn -P quality -Dsimulator -Dnoredist clean install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apachecloudstack -Dsonar.pullrequest.key=$PR_ID -Dsonar.pullrequest.base=main -Dsonar.pullrequest.branch=refs/pull/${{ github.event.number }}/merge -Dsonar.pullrequest.github.repository=apache/cloudstack -Dsonar.pullrequest.provider=GitHub
+          mvn -P quality -Dsimulator -Dnoredist clean install org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=apache_cloudstack
 
           echo "COVERAGE<<EOF" >> $GITHUB_ENV
           for file in ${{ steps.java-changes.outputs.all_changed_files }}; do
diff --git a/pom.xml b/pom.xml
index c315570fec7..e309e1e02a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.systemvm.template.version>4.17.0.0</project.systemvm.template.version>
-        <sonar.organization>apachecloudstack</sonar.organization>
+        <sonar.organization>apache</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
         <!-- Build properties -->