diff --git a/README.md b/README.md
index 2de2b7f54..57a2d6157 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
 
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat&logo=github&color=2370ff&labelColor=454545)](http://makeapullrequest.com)
 ![Build Passing](https://github.com/baremaps/baremaps/actions/workflows/build.yml/badge.svg)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=baremaps_baremaps&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=baremaps_baremaps)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=apache_baremaps&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=apache_baremaps)
 [![Mailing List](https://img.shields.io/badge/Apache-dev_mailing_list-success.svg?logo=apache)](https://lists.apache.org/list.html?dev@baremaps.apache.org)
 
 </div>
diff --git a/pom.xml b/pom.xml
index 0dcdf43e5..538446249 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,8 +73,8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <sonar.host.url>https://sonarcloud.io</sonar.host.url>
     <sonar.moduleKey>${project.groupId}:${project.artifactId}</sonar.moduleKey>
-    <sonar.organization>baremaps</sonar.organization>
-    <sonar.projectKey>baremaps_baremaps</sonar.projectKey>
+    <sonar.organization>apache</sonar.organization>
+    <sonar.projectKey>apache_baremaps</sonar.projectKey>
     <version.lib.activation>1.2.2</version.lib.activation>
     <version.lib.annotation-api>1.3.2</version.lib.annotation-api>
     <version.lib.awaitability>3.0.0</version.lib.awaitability>