diff --git a/README.md b/README.md
index f04550b..f2f959a 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # Eclipse Yasson
 
-[![Maven Central](https://img.shields.io/maven-central/v/org.eclipse/yasson.svg?label=Maven%20Central)](https://mvnrepository.com/artifact/org.eclipse/yasson)
+[![Maven Central](https://img.shields.io/maven-central/v/org.eclipse.yasson/yasson.svg?label=Maven%20Central)](https://mvnrepository.com/artifact/org.eclipse.yasson/yasson)
 <!-- TODO reenable once snapshots can be browsed via https://central.sonatype.com/service/rest/repository/browse/maven-snapshots
-[![Jakarta Staging (Snapshots)](https://img.shields.io/nexus/s/https/jakarta.oss.sonatype.org/org.eclipse/yasson.svg)](https://jakarta.oss.sonatype.org/content/repositories/staging/org/eclipse/yasson/)
+[![Jakarta Staging (Snapshots)](https://img.shields.io/nexus/s/https/jakarta.oss.sonatype.org/org.eclipse.yasson/yasson.svg)](https://jakarta.oss.sonatype.org/content/repositories/staging/org/eclipse/yasson/yasson/)
 -->
 [![Gitter](https://badges.gitter.im/eclipse/yasson.svg)](https://gitter.im/eclipse/yasson)
-[![Javadocs](https://www.javadoc.io/badge/org.eclipse/yasson.svg)](https://www.javadoc.io/doc/org.eclipse/yasson)
+[![Javadocs](https://www.javadoc.io/badge/org.eclipse.yasson/yasson.svg)](https://www.javadoc.io/doc/org.eclipse.yasson/yasson)
 [![Build Status](https://github.com/eclipse-ee4j/yasson/actions/workflows/maven.yml/badge.svg?branch=main)](https://github.com/eclipse-ee4j/yasson/actions/workflows/maven.yml?branch=main)
 [![License](https://img.shields.io/badge/License-EPL%202.0-green.svg)](https://opensource.org/licenses/EPL-2.0)
 
diff --git a/pom.xml b/pom.xml
index fcbef73..372e6a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
         <version>2.0.4</version>
     </parent>
 
-    <groupId>org.eclipse</groupId>
+    <groupId>org.eclipse.yasson</groupId>
     <artifactId>yasson</artifactId>
     <version>3.0.5-SNAPSHOT</version>
     <packaging>jar</packaging>
diff --git a/yasson-jmh/pom.xml b/yasson-jmh/pom.xml
index 61d3046..ccfcb3d 100644
--- a/yasson-jmh/pom.xml
+++ b/yasson-jmh/pom.xml
@@ -36,7 +36,7 @@
             <version>${jmh.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse</groupId>
+            <groupId>org.eclipse.yasson</groupId>
             <artifactId>yasson</artifactId>
             <version>${yasson.version}</version>
         </dependency>
diff --git a/yasson-tck/pom.xml b/yasson-tck/pom.xml
index bab505d..c0af096 100644
--- a/yasson-tck/pom.xml
+++ b/yasson-tck/pom.xml
@@ -12,7 +12,7 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.eclipse</groupId>
+    <groupId>org.eclipse.yasson</groupId>
     <artifactId>yasson-tck</artifactId>
     <version>1.0.0-SNAPSHOT</version>
 
@@ -59,7 +59,7 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.eclipse</groupId>
+            <groupId>org.eclipse.yasson</groupId>
             <artifactId>yasson</artifactId>
             <version>${yasson.version}</version>
             <scope>test</scope>