diff --git a/digiwf-connector/digiwf-camunda-connector-starter/pom.xml b/digiwf-connector/digiwf-camunda-connector-starter/pom.xml
index 994412b3b9..00d60aba47 100644
--- a/digiwf-connector/digiwf-camunda-connector-starter/pom.xml
+++ b/digiwf-connector/digiwf-camunda-connector-starter/pom.xml
@@ -51,7 +51,7 @@
 
         <!-- DigiWF -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-connector/digiwf-camunda-connector/pom.xml b/digiwf-connector/digiwf-camunda-connector/pom.xml
index 0f6663fdcc..6f98446d29 100644
--- a/digiwf-connector/digiwf-camunda-connector/pom.xml
+++ b/digiwf-connector/digiwf-camunda-connector/pom.xml
@@ -44,7 +44,7 @@
 
         <!-- DigiWF -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-connector/digiwf-connector-core/pom.xml b/digiwf-connector/digiwf-connector-core/pom.xml
index cd0e57ba0b..aaca578c05 100644
--- a/digiwf-connector/digiwf-connector-core/pom.xml
+++ b/digiwf-connector/digiwf-connector-core/pom.xml
@@ -31,7 +31,7 @@
 
         <!-- DigiWF -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-connector/digiwf-connector-starter-rest/pom.xml b/digiwf-connector/digiwf-connector-starter-rest/pom.xml
index e13940c5fd..ee023b8181 100644
--- a/digiwf-connector/digiwf-connector-starter-rest/pom.xml
+++ b/digiwf-connector/digiwf-connector-starter-rest/pom.xml
@@ -50,7 +50,7 @@
 
         <!-- DigiWF -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-connector/digiwf-connector-starter/pom.xml b/digiwf-connector/digiwf-connector-starter/pom.xml
index e1770212f0..779159c011 100644
--- a/digiwf-connector/digiwf-connector-starter/pom.xml
+++ b/digiwf-connector/digiwf-connector-starter/pom.xml
@@ -51,7 +51,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-coverage/pom.xml b/digiwf-coverage/pom.xml
index 1c2fbbd7b5..766963123e 100644
--- a/digiwf-coverage/pom.xml
+++ b/digiwf-coverage/pom.xml
@@ -139,37 +139,37 @@
 
         <!-- digiwf-libs -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>example-json-serialization</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-cloudstream-utils-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>example-spring-cloudstream-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-camunda-prometheus-core</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-camunda-prometheus-example</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-message-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-engine/digiwf-engine-service/pom.xml b/digiwf-engine/digiwf-engine-service/pom.xml
index cbe9da2faa..52baa08d68 100644
--- a/digiwf-engine/digiwf-engine-service/pom.xml
+++ b/digiwf-engine/digiwf-engine-service/pom.xml
@@ -52,7 +52,7 @@
 
         <!-- DigiWF -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-core/pom.xml b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-core/pom.xml
index 3bdf6d14d4..db9098e5dd 100644
--- a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-core/pom.xml
+++ b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-core/pom.xml
@@ -25,7 +25,7 @@
 
         <!-- streaming -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-cloudstream-utils-starter</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
diff --git a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-starter/pom.xml b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-starter/pom.xml
index 4bb98b0519..a448be715f 100644
--- a/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-starter/pom.xml
+++ b/digiwf-integrations/digiwf-alw-integration/digiwf-alw-integration-starter/pom.xml
@@ -39,7 +39,7 @@
 
         <!-- streaming -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-cloudstream-utils-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-core/pom.xml b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-core/pom.xml
index 6e9a332aa2..a19f537389 100644
--- a/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-core/pom.xml
+++ b/digiwf-integrations/digiwf-cosys-integration/digiwf-cosys-integration-core/pom.xml
@@ -53,7 +53,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-message-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml
index 91909cd7f8..d3db4fdf9a 100644
--- a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml
+++ b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-message-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-core/pom.xml b/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-core/pom.xml
index 9933b80147..cca399f310 100644
--- a/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-core/pom.xml
+++ b/digiwf-integrations/digiwf-example-integration/digiwf-example-integration-core/pom.xml
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-message-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-example/pom.xml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-example/pom.xml
index 04f647801a..ad503a6e83 100644
--- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-example/pom.xml
+++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-client-example/pom.xml
@@ -35,7 +35,7 @@
         </dependency>
         <!-- Security -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-security-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -49,7 +49,7 @@
 
         <!-- Spring Cloud Stream -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-message-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml
index a6582b1a08..594f760e7f 100644
--- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml
+++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-core/pom.xml
@@ -34,7 +34,7 @@
 
         <!-- DigiWF Message -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-message-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/pom.xml b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/pom.xml
index c497aba080..9ed7bb141d 100644
--- a/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/pom.xml
+++ b/digiwf-integrations/digiwf-s3-integration/digiwf-s3-integration-service/pom.xml
@@ -33,7 +33,7 @@
 
         <!-- Security -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-security-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-core/pom.xml b/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-core/pom.xml
index bea0685bbf..7e888a733f 100644
--- a/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-core/pom.xml
+++ b/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-core/pom.xml
@@ -38,7 +38,7 @@
 
         <!-- streaming -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-cloudstream-utils-starter</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
diff --git a/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-starter/pom.xml b/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-starter/pom.xml
index 6972ec7b66..a9fd768754 100644
--- a/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-starter/pom.xml
+++ b/digiwf-integrations/digiwf-verification-integration/digiwf-verification-integration-starter/pom.xml
@@ -37,7 +37,7 @@
 
         <!-- streaming -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-cloudstream-utils-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-core/pom.xml b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-core/pom.xml
index 618260471a..4baf7bd1d3 100644
--- a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-core/pom.xml
+++ b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-core/pom.xml
@@ -8,7 +8,7 @@
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-camunda-prometheus</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
diff --git a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-example/pom.xml b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-example/pom.xml
index dd2bb8f34f..9495fe8af0 100644
--- a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-example/pom.xml
+++ b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-example/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>digiwf-camunda-prometheus-example</artifactId>
+
     <parent>
         <artifactId>digiwf-camunda-prometheus</artifactId>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>digiwf-camunda-prometheus-example</artifactId>
 
     <dependencies>
         <!-- Spring boot -->
@@ -23,7 +23,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-camunda-prometheus-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-starter/pom.xml b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-starter/pom.xml
index eb65ad5b67..3d61db245f 100644
--- a/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-starter/pom.xml
+++ b/digiwf-libs/digiwf-camunda-prometheus/digiwf-camunda-prometheus-starter/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>digiwf-camunda-prometheus-starter</artifactId>
+
     <parent>
         <artifactId>digiwf-camunda-prometheus</artifactId>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>digiwf-camunda-prometheus-starter</artifactId>
 
     <dependencies>
         <dependency>
@@ -21,7 +21,7 @@
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-camunda-prometheus-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-libs/digiwf-camunda-prometheus/pom.xml b/digiwf-libs/digiwf-camunda-prometheus/pom.xml
index f203d15e5e..7a784c9da1 100644
--- a/digiwf-libs/digiwf-camunda-prometheus/pom.xml
+++ b/digiwf-libs/digiwf-camunda-prometheus/pom.xml
@@ -2,15 +2,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>digiwf-camunda-prometheus</artifactId>
+    <packaging>pom</packaging>
+
     <parent>
         <artifactId>digiwf-libs</artifactId>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>digiwf-camunda-prometheus</artifactId>
-    <packaging>pom</packaging>
 
     <modules>
         <module>digiwf-camunda-prometheus-core</module>
diff --git a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml
index c8560d2b33..7dd94be2af 100644
--- a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml
+++ b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-core/pom.xml
@@ -8,7 +8,7 @@
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-json-serialization</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
diff --git a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml
index d6a28fbc47..431600d806 100644
--- a/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml
+++ b/digiwf-libs/digiwf-json-serialization/digiwf-json-serialization-starter/pom.xml
@@ -8,7 +8,7 @@
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-json-serialization</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
@@ -23,7 +23,7 @@
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml b/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml
index 809a27f6d6..fe08320a0c 100644
--- a/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml
+++ b/digiwf-libs/digiwf-json-serialization/example-json-serialization/pom.xml
@@ -7,7 +7,7 @@
     <name>example-json-serialization</name>
 
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-json-serialization</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
@@ -20,7 +20,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-libs/digiwf-json-serialization/pom.xml b/digiwf-libs/digiwf-json-serialization/pom.xml
index 209fb2a024..aa1e6f7aba 100644
--- a/digiwf-libs/digiwf-json-serialization/pom.xml
+++ b/digiwf-libs/digiwf-json-serialization/pom.xml
@@ -9,7 +9,7 @@
     <description>Json Schema Serialization used by DigiWF</description>
 
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-libs</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
diff --git a/digiwf-libs/digiwf-message/digiwf-message-core/pom.xml b/digiwf-libs/digiwf-message/digiwf-message-core/pom.xml
index 305e1e99c3..5f4b866492 100644
--- a/digiwf-libs/digiwf-message/digiwf-message-core/pom.xml
+++ b/digiwf-libs/digiwf-message/digiwf-message-core/pom.xml
@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>digiwf-message-core</artifactId>
+
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-message</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>digiwf-message-core</artifactId>
-
     <dependencies>
         <dependency>
             <groupId>org.slf4j</groupId>
diff --git a/digiwf-libs/digiwf-message/digiwf-message-example/pom.xml b/digiwf-libs/digiwf-message/digiwf-message-example/pom.xml
index 5dcc4b0b2a..f0f99fb2a1 100644
--- a/digiwf-libs/digiwf-message/digiwf-message-example/pom.xml
+++ b/digiwf-libs/digiwf-message/digiwf-message-example/pom.xml
@@ -3,21 +3,21 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>digiwf-message-example</artifactId>
+
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-message</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>digiwf-message-example</artifactId>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-message-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-libs/digiwf-message/digiwf-message-starter/pom.xml b/digiwf-libs/digiwf-message/digiwf-message-starter/pom.xml
index 19631eaa97..235728d0fd 100644
--- a/digiwf-libs/digiwf-message/digiwf-message-starter/pom.xml
+++ b/digiwf-libs/digiwf-message/digiwf-message-starter/pom.xml
@@ -3,18 +3,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>digiwf-message-starter</artifactId>
+    <packaging>jar</packaging>
+
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-message</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>digiwf-message-starter</artifactId>
-    <packaging>jar</packaging>
-
     <dependencies>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-message-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-libs/digiwf-message/pom.xml b/digiwf-libs/digiwf-message/pom.xml
index 3cf0035e78..fe0011261a 100644
--- a/digiwf-libs/digiwf-message/pom.xml
+++ b/digiwf-libs/digiwf-message/pom.xml
@@ -3,15 +3,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>digiwf-message</artifactId>
+    <packaging>pom</packaging>
+
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-libs</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>digiwf-message</artifactId>
-    <packaging>pom</packaging>
-
     <modules>
         <module>digiwf-message-core</module>
         <module>digiwf-message-starter</module>
diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml
index 64e93af88d..8766a15257 100644
--- a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml
+++ b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-core/pom.xml
@@ -7,7 +7,7 @@
 
     <parent>
         <artifactId>digiwf-spring-cloudstream-utils</artifactId>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
 
diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml
index 9a33050d04..71daa94cb1 100644
--- a/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml
+++ b/digiwf-libs/digiwf-spring-cloudstream-utils/digiwf-spring-cloudstream-utils-starter/pom.xml
@@ -9,13 +9,13 @@
 
     <parent>
         <artifactId>digiwf-spring-cloudstream-utils</artifactId>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-cloudstream-utils-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml
index cfe5e73560..5a47b8ee47 100644
--- a/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml
+++ b/digiwf-libs/digiwf-spring-cloudstream-utils/example-spring-cloudstream-utils/pom.xml
@@ -8,13 +8,13 @@
 
     <parent>
         <artifactId>digiwf-spring-cloudstream-utils</artifactId>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-cloudstream-utils-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml b/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml
index 8947504d07..8fb37e26f9 100644
--- a/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml
+++ b/digiwf-libs/digiwf-spring-cloudstream-utils/pom.xml
@@ -10,7 +10,7 @@
     <description>Cloudstream Utils used by DigiWF</description>
 
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-libs</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
diff --git a/digiwf-libs/digiwf-spring-security/digiwf-spring-security-core/pom.xml b/digiwf-libs/digiwf-spring-security/digiwf-spring-security-core/pom.xml
index 5ea072be79..121f221b47 100644
--- a/digiwf-libs/digiwf-spring-security/digiwf-spring-security-core/pom.xml
+++ b/digiwf-libs/digiwf-spring-security/digiwf-spring-security-core/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-spring-security</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
diff --git a/digiwf-libs/digiwf-spring-security/digiwf-spring-security-starter/pom.xml b/digiwf-libs/digiwf-spring-security/digiwf-spring-security-starter/pom.xml
index 6b14bed5e3..514805846e 100644
--- a/digiwf-libs/digiwf-spring-security/digiwf-spring-security-starter/pom.xml
+++ b/digiwf-libs/digiwf-spring-security/digiwf-spring-security-starter/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-spring-security</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
@@ -13,7 +13,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-security-core</artifactId>
         </dependency>
         <!-- Configuration Processor -->
diff --git a/digiwf-libs/digiwf-spring-security/pom.xml b/digiwf-libs/digiwf-spring-security/pom.xml
index 4390031701..0a80b8ebfd 100644
--- a/digiwf-libs/digiwf-spring-security/pom.xml
+++ b/digiwf-libs/digiwf-spring-security/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-libs</artifactId>
         <version>0.18.0-SNAPSHOT</version>
     </parent>
@@ -23,12 +23,12 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>io.muenchendigital.digiwf</groupId>
+                <groupId>de.muenchen.oss.digiwf</groupId>
                 <artifactId>digiwf-spring-security-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.muenchendigital.digiwf</groupId>
+                <groupId>de.muenchen.oss.digiwf</groupId>
                 <artifactId>digiwf-spring-security-starter</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/digiwf-libs/pom.xml b/digiwf-libs/pom.xml
index 54db17f95e..5adf744cc9 100644
--- a/digiwf-libs/pom.xml
+++ b/digiwf-libs/pom.xml
@@ -9,10 +9,10 @@
     <description>Libs by DigiWF</description>
 
     <parent>
-        <groupId>io.muenchendigital.digiwf</groupId>
+        <groupId>de.muenchen.oss.digiwf</groupId>
         <artifactId>digiwf-core</artifactId>
         <version>0.18.0-SNAPSHOT</version>
-        <relativePath>../pom-old.xml</relativePath>
+        <relativePath>../pom-new.xml</relativePath>
     </parent>
 
     <modules>
diff --git a/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml b/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml
index d349cda7b4..40140ef87c 100644
--- a/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml
+++ b/digiwf-schema-registry/digiwf-schema-registry-service/pom.xml
@@ -50,7 +50,7 @@
 
         <!-- DigiWF -->
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-core</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/digiwf-task/digiwf-tasklist-service/pom.xml b/digiwf-task/digiwf-tasklist-service/pom.xml
index 2ad2d1d51f..1c5d8cef7d 100644
--- a/digiwf-task/digiwf-tasklist-service/pom.xml
+++ b/digiwf-task/digiwf-tasklist-service/pom.xml
@@ -28,7 +28,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.muenchendigital.digiwf</groupId>
+            <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-json-serialization-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/pom-new.xml b/pom-new.xml
index fcc6ba7b6d..df923cf0e8 100644
--- a/pom-new.xml
+++ b/pom-new.xml
@@ -38,6 +38,7 @@
         <module>digiwf-process</module>
         <module>digiwf-schema-registry</module>
         <module>digiwf-task</module>
+        <module>digiwf-libs</module>
         <module>digiwf-integrations</module>
     </modules>
 
diff --git a/pom-old.xml b/pom-old.xml
index b081342897..52012910aa 100644
--- a/pom-old.xml
+++ b/pom-old.xml
@@ -32,7 +32,6 @@
     </properties>
 
     <modules>
-        <module>digiwf-libs</module>
         <module>digiwf-coverage</module>
     </modules>