This is an automated email from the ASF dual-hosted git repository.

pefernan pushed a commit to branch main
in repository 
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git


The following commit(s) were added to refs/heads/main by this push:
     new 141c1a0d2e incubator-kie-issues#1045: Rename missing addons in 
`incubator-kie-kogito-runtimes/addons` (#3452)
141c1a0d2e is described below

commit 141c1a0d2ec19448529fc791235c65aa1ccbc7d0
Author: Pere Fernández <[email protected]>
AuthorDate: Tue Mar 26 16:23:28 2024 +0100

    incubator-kie-issues#1045: Rename missing addons in 
`incubator-kie-kogito-runtimes/addons` (#3452)
---
 addons/README.md                                   |   2 +-
 addons/common/events/decisions/pom.xml             |  12 +-
 addons/common/events/mongodb/pom.xml               |  14 +-
 addons/common/events/pom.xml                       |   8 +-
 addons/common/events/predictions/pom.xml           |  12 +-
 addons/common/events/rules/pom.xml                 |   9 +-
 addons/common/explainability/pom.xml               |   6 +-
 addons/common/human-task-prediction/api/pom.xml    |  10 +-
 addons/common/human-task-prediction/pom.xml        |   5 +-
 addons/common/human-task-prediction/smile/pom.xml  |  14 +-
 addons/common/jobs/api/pom.xml                     |   2 +-
 addons/common/jobs/management-common/pom.xml       |   4 +-
 addons/common/jobs/pom.xml                         |   2 +-
 addons/common/knative/eventing/pom.xml             |   6 +-
 addons/common/knative/pom.xml                      |   2 +-
 addons/common/kubernetes-service-catalog/pom.xml   |   6 +-
 addons/common/kubernetes/pom.xml                   |   8 +-
 addons/common/mail/pom.xml                         |   7 +-
 addons/common/marshallers/avro/pom.xml             |   8 +-
 addons/common/marshallers/pom.xml                  |   8 +-
 addons/common/messaging/pom.xml                    |   6 +-
 addons/common/monitoring/core/pom.xml              |   6 +-
 addons/common/monitoring/elastic/pom.xml           |  16 +-
 addons/common/monitoring/pom.xml                   |   6 +-
 addons/common/monitoring/prometheus/pom.xml        |  12 +-
 addons/common/persistence/README.md                |   2 +-
 addons/common/persistence/ddl/pom.xml              |   8 +-
 addons/common/persistence/filesystem/pom.xml       |  10 +-
 addons/common/persistence/infinispan/pom.xml       |  10 +-
 addons/common/persistence/jdbc/pom.xml             |  10 +-
 addons/common/persistence/mongodb/pom.xml          |  10 +-
 addons/common/persistence/pom.xml                  |   8 +-
 addons/common/persistence/postgresql/pom.xml       |  12 +-
 addons/common/persistence/rocksdb/pom.xml          |  10 +-
 addons/common/pom.xml                              |   2 +-
 addons/common/process-management/pom.xml           |   6 +-
 addons/common/process-svg/pom.xml                  |   6 +-
 addons/common/rest-exception-handler/pom.xml       |   6 +-
 addons/common/task-management/pom.xml              |   7 +-
 addons/common/tracing/decision-common/pom.xml      |  16 +-
 addons/common/tracing/pom.xml                      |   6 +-
 addons/common/tracing/tracing-api/pom.xml          |  12 +-
 addons/common/tracing/typedvalue-api/pom.xml       |   8 +-
 addons/deprecated/README.md                        |  52 ++---
 addons/pom.xml                                     |   3 +
 kogito-bom/pom.xml                                 | 246 ++++++++++-----------
 .../pom.xml                                        |   4 +-
 quarkus/addons/events/decisions/runtime/pom.xml    |   4 +-
 quarkus/addons/events/mongodb/runtime/pom.xml      |   4 +-
 quarkus/addons/events/predictions/runtime/pom.xml  |   4 +-
 quarkus/addons/events/rules/runtime/pom.xml        |   4 +-
 quarkus/addons/explainability/runtime/pom.xml      |   4 +-
 .../runtime/pom.xml                                |   8 +-
 .../test-utils/pom.xml                             |   4 +-
 quarkus/addons/jobs/common/messaging/pom.xml       |   2 +-
 quarkus/addons/jobs/common/rest-callback/pom.xml   |   2 +-
 quarkus/addons/jobs/management/runtime/pom.xml     |   6 +-
 quarkus/addons/jobs/messaging/runtime/pom.xml      |   2 +-
 quarkus/addons/knative/eventing/runtime/pom.xml    |   2 +-
 quarkus/addons/kubernetes/runtime/pom.xml          |   8 +-
 quarkus/addons/mail/runtime/pom.xml                |   4 +-
 quarkus/addons/marshallers/avro/runtime/pom.xml    |   4 +-
 quarkus/addons/messaging/common/pom.xml            |   4 +-
 .../runtime/pom.xml                                |   8 +-
 quarkus/addons/monitoring/core/pom.xml             |   8 +-
 quarkus/addons/monitoring/elastic/runtime/pom.xml  |   4 +-
 .../addons/monitoring/prometheus/runtime/pom.xml   |   4 +-
 .../addons/persistence/filesystem/runtime/pom.xml  |   4 +-
 .../addons/persistence/infinispan/runtime/pom.xml  |   4 +-
 quarkus/addons/persistence/jdbc/runtime/pom.xml    |   4 +-
 quarkus/addons/persistence/mongodb/runtime/pom.xml |   4 +-
 .../addons/persistence/postgresql/runtime/pom.xml  |   4 +-
 .../KogitoAddOnPersistenceRocksDBProcessor.java    |   2 +-
 quarkus/addons/persistence/rocksdb/runtime/pom.xml |   4 +-
 quarkus/addons/process-management/runtime/pom.xml  |   4 +-
 quarkus/addons/process-svg/runtime/pom.xml         |   8 +-
 quarkus/addons/rest-exception-handler/pom.xml      |   4 +-
 quarkus/addons/task-management/runtime/pom.xml     |   4 +-
 quarkus/addons/tracing-decision/runtime/pom.xml    |   4 +-
 springboot/addons/events/decisions/pom.xml         |   4 +-
 springboot/addons/events/mongodb/pom.xml           |   4 +-
 springboot/addons/events/predictions/pom.xml       |   4 +-
 springboot/addons/events/rules/pom.xml             |   4 +-
 springboot/addons/explainability/pom.xml           |   4 +-
 springboot/addons/jobs/pom.xml                     |   6 +-
 springboot/addons/kubernetes/pom.xml               |   4 +-
 springboot/addons/mail/pom.xml                     |   4 +-
 springboot/addons/messaging/implementation/pom.xml |   4 +-
 springboot/addons/monitoring/core/pom.xml          |   8 +-
 springboot/addons/monitoring/elastic/pom.xml       |   4 +-
 springboot/addons/monitoring/prometheus/pom.xml    |   4 +-
 springboot/addons/persistence/filesystem/pom.xml   |   4 +-
 springboot/addons/persistence/infinispan/pom.xml   |   4 +-
 springboot/addons/persistence/jdbc/pom.xml         |   4 +-
 springboot/addons/persistence/mongodb/pom.xml      |   4 +-
 springboot/addons/persistence/postgresql/pom.xml   |   4 +-
 springboot/addons/process-management/pom.xml       |   4 +-
 springboot/addons/process-svg/pom.xml              |   8 +-
 springboot/addons/rest-exception-handler/pom.xml   |   4 +-
 springboot/addons/task-management/pom.xml          |   4 +-
 springboot/addons/tracing-decision/pom.xml         |   4 +-
 springboot/archetype/README.md                     |   2 +-
 .../META-INF/archetype-post-generate.groovy        |   2 +-
 103 files changed, 447 insertions(+), 440 deletions(-)

diff --git a/addons/README.md b/addons/README.md
index c248666aec..63aaa4bf5b 100644
--- a/addons/README.md
+++ b/addons/README.md
@@ -9,7 +9,7 @@ The following table lists all the add-ons, independent of 
runtime implementation
 
 | Add-On Description     | Artifact ID                          | Since        
       |
 
|------------------------|--------------------------------------|---------------------|
-| Human Task Predictions | kogito-addons-human-task-prediction-api | 0.7.0     
       |
+| Human Task Predictions | jbpm-addons-human-task-prediction-api | 0.7.0       
     |
 
 ### Quarkus Implementation
 
diff --git a/addons/common/events/decisions/pom.xml 
b/addons/common/events/decisions/pom.xml
index fdae2fc91e..0144499a8c 100644
--- a/addons/common/events/decisions/pom.xml
+++ b/addons/common/events/decisions/pom.xml
@@ -24,13 +24,13 @@
          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>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-events-decisions</artifactId>
-  <name>Kogito :: Add-Ons :: Events :: Event-Driven Decisions</name>
+  <artifactId>kie-addons-events-decisions</artifactId>
+  <name>KIE :: Add-Ons :: Events :: Event-Driven Decisions</name>
   <description>Trigger evaluation of decision models via events</description>
 
   <properties>
@@ -59,8 +59,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-messaging</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/addons/common/events/mongodb/pom.xml 
b/addons/common/events/mongodb/pom.xml
index 8f16776963..50c7da53b1 100644
--- a/addons/common/events/mongodb/pom.xml
+++ b/addons/common/events/mongodb/pom.xml
@@ -25,14 +25,14 @@
          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>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-events-mongodb</artifactId>
-  <name>Kogito :: Add-Ons :: Events :: MongoDB</name>
-  <description>Common addon for Kogito Events based on MongoDB</description>
+  <artifactId>kie-addons-events-mongodb</artifactId>
+  <name>KIE :: Add-Ons :: Events :: MongoDB</name>
+  <description>Common addon for KIE Events based on MongoDB</description>
 
   <properties>
     <java.module.name>org.kie.kogito.events.mongodb</java.module.name>
@@ -44,8 +44,8 @@
       <artifactId>kogito-events-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-mongodb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-mongodb</artifactId>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/addons/common/events/pom.xml b/addons/common/events/pom.xml
index dd18af9579..89c1f4f901 100644
--- a/addons/common/events/pom.xml
+++ b/addons/common/events/pom.xml
@@ -21,15 +21,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>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-common-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-events-parent</artifactId>
+  <artifactId>kie-addons-events-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito :: Add-Ons :: Events :: Parent</name>
+  <name>KIE :: Add-Ons :: Events :: Parent</name>
 
-  <description>Kogito Events</description>
+  <description>KIE Events</description>
 
   <modules>
     <module>decisions</module>
diff --git a/addons/common/events/predictions/pom.xml 
b/addons/common/events/predictions/pom.xml
index 0ba1dc18c5..630354c336 100644
--- a/addons/common/events/predictions/pom.xml
+++ b/addons/common/events/predictions/pom.xml
@@ -24,13 +24,13 @@
          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>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-events-predictions</artifactId>
-  <name>Kogito :: Add-Ons :: Events :: Event-Driven Predictions</name>
+  <artifactId>kie-addons-events-predictions</artifactId>
+  <name>KIE :: Add-Ons :: Events :: Event-Driven Predictions</name>
   <description>Trigger evaluation of PMML models via events</description>
 
   <properties>
@@ -54,8 +54,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-messaging</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/addons/common/events/rules/pom.xml 
b/addons/common/events/rules/pom.xml
index b7dec129cb..f35a7abe7c 100644
--- a/addons/common/events/rules/pom.xml
+++ b/addons/common/events/rules/pom.xml
@@ -24,13 +24,14 @@
          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>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-events-rules</artifactId>
-  <name>Kogito :: Add-Ons :: Events :: Event-Driven Rules</name>
+  <groupId>org.drools</groupId>
+  <artifactId>drools-addons-events-rules</artifactId>
+  <name>Drools :: Add-Ons :: Events :: Event-Driven Rules</name>
   <description>Trigger evaluation of rule models via events</description>
 
 
diff --git a/addons/common/explainability/pom.xml 
b/addons/common/explainability/pom.xml
index b978bb77dc..d551c5a393 100644
--- a/addons/common/explainability/pom.xml
+++ b/addons/common/explainability/pom.xml
@@ -24,13 +24,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-common-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-explainability</artifactId>
-  <name>Kogito :: Add-Ons :: Explainability</name>
+  <artifactId>kie-addons-explainability</artifactId>
+  <name>KIE :: Add-Ons :: Explainability</name>
 
   <properties>
     <java.module.name>org.kie.kogito.explainability</java.module.name>
diff --git a/addons/common/human-task-prediction/api/pom.xml 
b/addons/common/human-task-prediction/api/pom.xml
index 9d184a540c..817ed654ae 100644
--- a/addons/common/human-task-prediction/api/pom.xml
+++ b/addons/common/human-task-prediction/api/pom.xml
@@ -23,14 +23,14 @@
   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>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-human-task-prediction-parent</artifactId>
+    <groupId>org.jbpm</groupId>
+    <artifactId>jbpm-addons-human-task-prediction-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-human-task-prediction-api</artifactId>
-  <name>Kogito :: Add-Ons :: Predictions :: API</name>
+  <artifactId>jbpm-addons-human-task-prediction-api</artifactId>
+  <name>jBPM :: Add-Ons :: Predictions :: API</name>
 
-  <description>Kogito Predictions API</description>
+  <description>jBPM Predictions API</description>
 
   <properties>
     <java.module.name>org.kie.kogito.prediction.api</java.module.name>
diff --git a/addons/common/human-task-prediction/pom.xml 
b/addons/common/human-task-prediction/pom.xml
index 8c2f0ac826..0c7212c515 100644
--- a/addons/common/human-task-prediction/pom.xml
+++ b/addons/common/human-task-prediction/pom.xml
@@ -21,11 +21,12 @@
 <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>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-common-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-human-task-prediction-parent</artifactId>
+  <groupId>org.jbpm</groupId>
+  <artifactId>jbpm-addons-human-task-prediction-parent</artifactId>
   <packaging>pom</packaging>
   <name>Kogito :: Add-Ons :: Predictions</name>
   <description>Kogito Predictions</description>
diff --git a/addons/common/human-task-prediction/smile/pom.xml 
b/addons/common/human-task-prediction/smile/pom.xml
index 28fd8ebd82..0ac57f042f 100644
--- a/addons/common/human-task-prediction/smile/pom.xml
+++ b/addons/common/human-task-prediction/smile/pom.xml
@@ -23,13 +23,13 @@
          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>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-human-task-prediction-parent</artifactId>
+    <groupId>org.jbpm</groupId>
+    <artifactId>jbpm-addons-human-task-prediction-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-human-task-prediction-smile</artifactId>
-  <name>Kogito :: Add-Ons :: Predictions :: SMILE</name>
-  <description>Kogito Prediction based on SMILE addon</description>
+  <artifactId>jbpm-addons-human-task-prediction-smile</artifactId>
+  <name>jBPM :: Add-Ons :: Predictions :: SMILE</name>
+  <description>jBPM Prediction based on SMILE addon</description>
 
   <properties>
     <java.module.name>org.kie.kogito.predictions.smile</java.module.name>
@@ -49,8 +49,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-human-task-prediction-api</artifactId>
+      <groupId>org.jbpm</groupId>
+      <artifactId>jbpm-addons-human-task-prediction-api</artifactId>
     </dependency>
     <dependency>
       <groupId>com.github.haifengl</groupId>
diff --git a/addons/common/jobs/api/pom.xml b/addons/common/jobs/api/pom.xml
index 4aa64a01e6..b2d3b7c0ef 100644
--- a/addons/common/jobs/api/pom.xml
+++ b/addons/common/jobs/api/pom.xml
@@ -23,7 +23,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>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-jobs-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/addons/common/jobs/management-common/pom.xml 
b/addons/common/jobs/management-common/pom.xml
index 24f4857eb3..d7ab6b3e55 100644
--- a/addons/common/jobs/management-common/pom.xml
+++ b/addons/common/jobs/management-common/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-jobs-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -42,7 +42,7 @@
       <artifactId>kogito-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-jobs-api</artifactId>
     </dependency>
 
diff --git a/addons/common/jobs/pom.xml b/addons/common/jobs/pom.xml
index 01e6d6054b..b419eb50c1 100644
--- a/addons/common/jobs/pom.xml
+++ b/addons/common/jobs/pom.xml
@@ -21,7 +21,7 @@
 <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>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-common-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/addons/common/knative/eventing/pom.xml 
b/addons/common/knative/eventing/pom.xml
index 6f3c34d129..b4b858b532 100644
--- a/addons/common/knative/eventing/pom.xml
+++ b/addons/common/knative/eventing/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-knative-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
diff --git a/addons/common/knative/pom.xml b/addons/common/knative/pom.xml
index 93168640e6..351bb2dd11 100644
--- a/addons/common/knative/pom.xml
+++ b/addons/common/knative/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-common-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/addons/common/kubernetes-service-catalog/pom.xml 
b/addons/common/kubernetes-service-catalog/pom.xml
index 7ddd933618..e2314088e6 100644
--- a/addons/common/kubernetes-service-catalog/pom.xml
+++ b/addons/common/kubernetes-service-catalog/pom.xml
@@ -24,13 +24,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
     <parent>
         <artifactId>kogito-addons-common-parent</artifactId>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kogito-addons-kubernetes-service-catalog</artifactId>
-    <name>Kogito :: Add-Ons :: Kubernetes Service Catalog</name>
+    <artifactId>kie-addons-kubernetes-service-catalog</artifactId>
+    <name>KIE :: Add-Ons :: Kubernetes Service Catalog</name>
     <description>Common Library for Kubernetes Service Discovery 
implementations</description>
 
   <properties>
diff --git a/addons/common/kubernetes/pom.xml b/addons/common/kubernetes/pom.xml
index 47e568f3af..c4bfa10de1 100644
--- a/addons/common/kubernetes/pom.xml
+++ b/addons/common/kubernetes/pom.xml
@@ -24,14 +24,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-common-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-kubernetes</artifactId>
-  <name>Kogito :: Add-Ons :: Kubernetes</name>
-  <description>Common library for Kogito Kubernetes Addons 
implementations</description>
+  <artifactId>kie-addons-kubernetes</artifactId>
+  <name>KIE :: Add-Ons :: Kubernetes</name>
+  <description>Common library for KIE Kubernetes Addons 
implementations</description>
 
   <properties>
     <java.module.name>org.kie.kogito.addons.k8s</java.module.name>
diff --git a/addons/common/mail/pom.xml b/addons/common/mail/pom.xml
index d0e37ba21f..009220eec1 100644
--- a/addons/common/mail/pom.xml
+++ b/addons/common/mail/pom.xml
@@ -24,13 +24,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-common-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-mail</artifactId>
-  <name>Kogito :: Add-Ons :: E-Mail :: Common</name>
+  <groupId>org.jbpm</groupId>
+  <artifactId>jbpm-addons-mail</artifactId>
+  <name>jBPM :: Add-Ons :: E-Mail :: Common</name>
 
   <properties>
     <java.module.name>org.kie.kogito.mail</java.module.name>
diff --git a/addons/common/marshallers/avro/pom.xml 
b/addons/common/marshallers/avro/pom.xml
index 92bcb8017e..23873e4287 100644
--- a/addons/common/marshallers/avro/pom.xml
+++ b/addons/common/marshallers/avro/pom.xml
@@ -23,13 +23,13 @@
          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>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-marshallers-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-marshallers-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-marshallers-avro</artifactId>
-  <name>Kogito :: Add-Ons :: Marshallers :: Avro</name>
+  <artifactId>kie-addons-marshallers-avro</artifactId>
+  <name>KIE :: Add-Ons :: Marshallers :: Avro</name>
   <description>Kogito Marshallers Unmarshaller for Avro</description>
 
   <properties>
diff --git a/addons/common/marshallers/pom.xml 
b/addons/common/marshallers/pom.xml
index fbad35ed8e..7f02b1a1d6 100644
--- a/addons/common/marshallers/pom.xml
+++ b/addons/common/marshallers/pom.xml
@@ -21,15 +21,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>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-common-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-marshallers-parent</artifactId>
+  <artifactId>kie-addons-marshallers-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito :: Add-Ons :: Marshallers :: Parent</name>
+  <name>KIE :: Add-Ons :: Marshallers :: Parent</name>
 
-  <description>Kogito Marshallers and Unmarshallers</description>
+  <description>KIE Marshallers and Unmarshallers</description>
 
   <modules>
     <module>avro</module>
diff --git a/addons/common/messaging/pom.xml b/addons/common/messaging/pom.xml
index 84c684d48e..50ed00ef38 100644
--- a/addons/common/messaging/pom.xml
+++ b/addons/common/messaging/pom.xml
@@ -23,13 +23,13 @@
          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>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-common-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-messaging</artifactId>
-  <name>Kogito :: Add-Ons :: Messaging</name>
+  <artifactId>kie-addons-messaging</artifactId>
+  <name>KIE :: Add-Ons :: Messaging</name>
   <description>Messaging Add-On Common Interfaces</description>
 
   <properties>
diff --git a/addons/common/monitoring/core/pom.xml 
b/addons/common/monitoring/core/pom.xml
index cf53d4ce54..af648e37f6 100644
--- a/addons/common/monitoring/core/pom.xml
+++ b/addons/common/monitoring/core/pom.xml
@@ -23,14 +23,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";>
   <parent>
-    <artifactId>kogito-addons-monitoring-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-monitoring-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <name>Kogito :: Add-Ons :: Monitoring Core</name>
 
-  <artifactId>kogito-addons-monitoring-core</artifactId>
+  <artifactId>kie-addons-monitoring-core</artifactId>
 
   <properties>
     <java.module.name>org.kie.kogito.monitoring.core.common</java.module.name>
diff --git a/addons/common/monitoring/elastic/pom.xml 
b/addons/common/monitoring/elastic/pom.xml
index 1108f6267a..ddfd57f2ba 100644
--- a/addons/common/monitoring/elastic/pom.xml
+++ b/addons/common/monitoring/elastic/pom.xml
@@ -23,15 +23,15 @@
          xmlns="http://maven.apache.org/POM/4.0.0";
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
-    <artifactId>kogito-addons-monitoring-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-monitoring-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-monitoring-elastic</artifactId>
+  <artifactId>kie-addons-monitoring-elastic</artifactId>
 
-  <name>Kogito :: Add-Ons :: Monitoring Elastic Common</name>
+  <name>KIE :: Add-Ons :: Monitoring Elastic Common</name>
   <description>Monitoring Elastic Core</description>
 
   <properties>
@@ -40,8 +40,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-core</artifactId>
     </dependency>
     <dependency>
       <groupId>io.micrometer</groupId>
@@ -65,8 +65,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/addons/common/monitoring/pom.xml b/addons/common/monitoring/pom.xml
index 206067d79a..4163419c72 100644
--- a/addons/common/monitoring/pom.xml
+++ b/addons/common/monitoring/pom.xml
@@ -23,12 +23,12 @@
          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>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-common-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-monitoring-parent</artifactId>
-  <name>Kogito :: Add-Ons :: Monitoring</name>
+  <artifactId>kie-addons-monitoring-parent</artifactId>
+  <name>KIE :: Add-Ons :: Monitoring</name>
   <packaging>pom</packaging>
 
   <description>Monitoring addons for runtime</description>
diff --git a/addons/common/monitoring/prometheus/pom.xml 
b/addons/common/monitoring/prometheus/pom.xml
index 020f0b7b49..7f0676cafd 100644
--- a/addons/common/monitoring/prometheus/pom.xml
+++ b/addons/common/monitoring/prometheus/pom.xml
@@ -23,14 +23,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";>
   <parent>
-    <artifactId>kogito-addons-monitoring-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-monitoring-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-monitoring-prometheus</artifactId>
-  <name>Kogito :: Add-Ons :: Monitoring Prometheus Common</name>
+  <artifactId>kie-addons-monitoring-prometheus</artifactId>
+  <name>KIE :: Add-Ons :: Monitoring Prometheus Common</name>
 
   <properties>
     
<java.module.name>org.kie.kogito.monitoring.prometheus.common.rest</java.module.name>
@@ -39,8 +39,8 @@
   <description>Prometheus monitoring for a kogito application</description>
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-core</artifactId>
     </dependency>
 
     <dependency>
diff --git a/addons/common/persistence/README.md 
b/addons/common/persistence/README.md
index 6be81fae96..402cd49d18 100644
--- a/addons/common/persistence/README.md
+++ b/addons/common/persistence/README.md
@@ -1,6 +1,6 @@
 # Kogito Persistence Add-ons
 
-The Kogito Persistence Add-ons adds persistence capability to Kogito 
projects.See 
+The KIE Persistence Add-ons adds persistence capability to Kogito projects.See 
 the [official 
documentation](https://docs.jboss.org/kogito/release/latest/html_single/#con-persistence_kogito-developing-process-services)
 to find out more.
 
diff --git a/addons/common/persistence/ddl/pom.xml 
b/addons/common/persistence/ddl/pom.xml
index 347509844f..a96bf50824 100644
--- a/addons/common/persistence/ddl/pom.xml
+++ b/addons/common/persistence/ddl/pom.xml
@@ -23,14 +23,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";>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>kogito-ddl-runtimes</artifactId>
-  <name>Kogito :: DB Scripts Collection</name>
+  <artifactId>kie-ddl-runtimes</artifactId>
+  <name>KIE :: DB Scripts Collection</name>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/addons/common/persistence/filesystem/pom.xml 
b/addons/common/persistence/filesystem/pom.xml
index 2dce567ae9..748910aeb2 100644
--- a/addons/common/persistence/filesystem/pom.xml
+++ b/addons/common/persistence/filesystem/pom.xml
@@ -21,14 +21,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 
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-persistence-filesystem</artifactId>
-  <name>Kogito :: Add-Ons :: Persistence :: File System</name>
+  <artifactId>kie-addons-persistence-filesystem</artifactId>
+  <name>KIE :: Add-Ons :: Persistence :: File System</name>
 
-  <description>File System based persistence for Kogito</description>
+  <description>File System based persistence for KIE</description>
 
   <properties>
     <java.module.name>org.kie.kogito.persistence.filesystem</java.module.name>
diff --git a/addons/common/persistence/infinispan/pom.xml 
b/addons/common/persistence/infinispan/pom.xml
index 21dbfa7dc9..82e4912fdb 100644
--- a/addons/common/persistence/infinispan/pom.xml
+++ b/addons/common/persistence/infinispan/pom.xml
@@ -23,13 +23,13 @@
   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>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-persistence-infinispan</artifactId>
-  <name>Kogito :: Add-Ons :: Persistence :: Infinispan</name>
-  <description>Infinispan based persistence for Kogito</description>
+  <artifactId>kie-addons-persistence-infinispan</artifactId>
+  <name>KIE :: Add-Ons :: Persistence :: Infinispan</name>
+  <description>Infinispan based persistence for KIE</description>
 
   <properties>
     <java.module.name>org.kie.kogito.infinispan</java.module.name>
diff --git a/addons/common/persistence/jdbc/pom.xml 
b/addons/common/persistence/jdbc/pom.xml
index 9689a7b998..e6bdd17b50 100644
--- a/addons/common/persistence/jdbc/pom.xml
+++ b/addons/common/persistence/jdbc/pom.xml
@@ -21,14 +21,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 
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-persistence-jdbc</artifactId>
-  <name>Kogito :: Add-Ons :: Persistence :: JDBC</name>
+  <artifactId>kie-addons-persistence-jdbc</artifactId>
+  <name>KIE :: Add-Ons :: Persistence :: JDBC</name>
 
-  <description>JDBC based persistence for Kogito</description>
+  <description>JDBC based persistence for KIE</description>
 
   <properties>
     <java.module.name>org.kie.kogito.persistence.jdbc</java.module.name>
diff --git a/addons/common/persistence/mongodb/pom.xml 
b/addons/common/persistence/mongodb/pom.xml
index 4e2d00ec99..2fe3c34a9f 100644
--- a/addons/common/persistence/mongodb/pom.xml
+++ b/addons/common/persistence/mongodb/pom.xml
@@ -23,15 +23,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";>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-persistence-mongodb</artifactId>
-  <name>Kogito :: Add-Ons :: Persistence :: MongoDB</name>
-  <description>MongoDB based persistence for Kogito</description>
+  <artifactId>kie-addons-persistence-mongodb</artifactId>
+  <name>KIE :: Add-Ons :: Persistence :: MongoDB</name>
+  <description>MongoDB based persistence for KIE</description>
 
   <properties>
     <java.module.name>org.kie.kogito.mongodb</java.module.name>
diff --git a/addons/common/persistence/pom.xml 
b/addons/common/persistence/pom.xml
index 2c0f6e201e..c7c1aa56f8 100644
--- a/addons/common/persistence/pom.xml
+++ b/addons/common/persistence/pom.xml
@@ -22,15 +22,15 @@
          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>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-common-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-persistence-parent</artifactId>
+  <artifactId>kie-addons-persistence-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito :: Add-Ons :: Persistence :: Parent</name>
+  <name>KIE :: Add-Ons :: Persistence :: Parent</name>
 
-  <description>Kogito Persistence Add-Ons Implementations</description>
+  <description>KIE Persistence Add-Ons Implementations</description>
 
   <modules>
     <module>jdbc</module>
diff --git a/addons/common/persistence/postgresql/pom.xml 
b/addons/common/persistence/postgresql/pom.xml
index af0fdf275d..abb4fac0e4 100644
--- a/addons/common/persistence/postgresql/pom.xml
+++ b/addons/common/persistence/postgresql/pom.xml
@@ -21,14 +21,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 
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-persistence-postgresql</artifactId>
-  <name>Kogito :: Add-Ons :: Persistence :: PostgreSQL</name>
+  <artifactId>kie-addons-persistence-postgresql</artifactId>
+  <name>KIE :: Add-Ons :: Persistence :: PostgreSQL</name>
 
-  <description>PostgreSQL based persistence for Kogito</description>
+  <description>PostgreSQL based persistence for KIE</description>
   <properties>
     <path.to.jdbc.addon>../jdbc</path.to.jdbc.addon>
     <path.to.script.folder>src/main/resources/db</path.to.script.folder>
@@ -132,7 +132,7 @@
           </filesets>
         </configuration>
       </plugin>
-<!--  The cleanest way would be to use the maven-dependency-plugin to unpack 
and copy scripts from the built artifact `kogito-addons-persistence-jdbc` but 
there's a limitation to using this only in the `package` phase whereas we need 
that into the `generate-sources` phase. See also 
https://issues.apache.org/jira/browse/MDEP-98 -->
+<!--  The cleanest way would be to use the maven-dependency-plugin to unpack 
and copy scripts from the built artifact `kie-addons-persistence-jdbc` but 
there's a limitation to using this only in the `package` phase whereas we need 
that into the `generate-sources` phase. See also 
https://issues.apache.org/jira/browse/MDEP-98 -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
diff --git a/addons/common/persistence/rocksdb/pom.xml 
b/addons/common/persistence/rocksdb/pom.xml
index cd3e591463..6b3ec3be67 100644
--- a/addons/common/persistence/rocksdb/pom.xml
+++ b/addons/common/persistence/rocksdb/pom.xml
@@ -23,13 +23,13 @@
   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>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-persistence-rocksdb</artifactId>
-  <name>Kogito :: Add-Ons :: Persistence :: RocksDB</name>
-  <description>RocksDB persistence add-on for Kogito</description>
+  <artifactId>kie-addons-persistence-rocksdb</artifactId>
+  <name>KIE :: Add-Ons :: Persistence :: RocksDB</name>
+  <description>RocksDB persistence add-on for KIE</description>
 
   <properties>
      <java.module.name>org.kie.kogito.persistence.rocksdb</java.module.name>
diff --git a/addons/common/pom.xml b/addons/common/pom.xml
index 4400c2eb3d..35d262844c 100644
--- a/addons/common/pom.xml
+++ b/addons/common/pom.xml
@@ -24,7 +24,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/addons/common/process-management/pom.xml 
b/addons/common/process-management/pom.xml
index 792bbb34a3..99bf2ff2ff 100644
--- a/addons/common/process-management/pom.xml
+++ b/addons/common/process-management/pom.xml
@@ -24,13 +24,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-common-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-process-management</artifactId>
-  <name>Kogito :: Add-Ons :: Process Management :: Common</name>
+  <artifactId>kie-addons-process-management</artifactId>
+  <name>KIE :: Add-Ons :: Process Management :: Common</name>
 
   <properties>
      <java.module.name>org.kie.kogito.process.management</java.module.name>
diff --git a/addons/common/process-svg/pom.xml 
b/addons/common/process-svg/pom.xml
index 868ec080b3..40dcb23455 100644
--- a/addons/common/process-svg/pom.xml
+++ b/addons/common/process-svg/pom.xml
@@ -24,13 +24,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-common-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-process-svg</artifactId>
-  <name>Kogito :: Add-Ons :: Process SVG :: Common</name>
+  <artifactId>kie-addons-process-svg</artifactId>
+  <name>KIE :: Add-Ons :: Process SVG :: Common</name>
 
   <properties>
      <java.module.name>org.kie.kogito.svg</java.module.name>
diff --git a/addons/common/rest-exception-handler/pom.xml 
b/addons/common/rest-exception-handler/pom.xml
index 3d0c6a7764..0a62912e55 100644
--- a/addons/common/rest-exception-handler/pom.xml
+++ b/addons/common/rest-exception-handler/pom.xml
@@ -24,13 +24,13 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-common-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-rest-exception-handler</artifactId>
-  <name>Kogito :: Rest Exception Handler :: Common</name>
+  <artifactId>kie-addons-rest-exception-handler</artifactId>
+  <name>KIE :: Rest Exception Handler :: Common</name>
 
   <properties>
       <java.module.name>org.kie.kogito.resource.exceptions</java.module.name>
diff --git a/addons/common/task-management/pom.xml 
b/addons/common/task-management/pom.xml
index 93326d039e..c6bf8f964e 100644
--- a/addons/common/task-management/pom.xml
+++ b/addons/common/task-management/pom.xml
@@ -24,13 +24,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-common-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-task-management</artifactId>
-  <name>Kogito :: Add-Ons :: Task Management :: Common</name>
+  <groupId>org.jbpm</groupId>
+  <artifactId>jbpm-addons-task-management</artifactId>
+  <name>jBPM :: Add-Ons :: Task Management :: Common</name>
 
   <properties>
       
<java.module.name>org.kie.kogito.task.management.service</java.module.name>
diff --git a/addons/common/tracing/decision-common/pom.xml 
b/addons/common/tracing/decision-common/pom.xml
index 9261d62b55..5ab47923a6 100644
--- a/addons/common/tracing/decision-common/pom.xml
+++ b/addons/common/tracing/decision-common/pom.xml
@@ -23,14 +23,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";>
   <parent>
-    <artifactId>kogito-addons-tracing-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-tracing-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-tracing-decision-common</artifactId>
-  <name>Kogito :: Add-Ons :: Tracing :: Common</name>
+  <artifactId>kie-addons-tracing-decision-common</artifactId>
+  <name>KIE :: Add-Ons :: Tracing :: Common</name>
 
   <properties>
     <java.module.name>org.kie.kogito.tracing.decision</java.module.name>
@@ -43,8 +43,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-tracing-api</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-tracing-api</artifactId>
     </dependency>
 
     <dependency>
@@ -53,8 +53,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-explainability</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-explainability</artifactId>
     </dependency>
 
     <dependency>
diff --git a/addons/common/tracing/pom.xml b/addons/common/tracing/pom.xml
index 55c3c725b6..f58dad7756 100644
--- a/addons/common/tracing/pom.xml
+++ b/addons/common/tracing/pom.xml
@@ -24,14 +24,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <parent>
     <artifactId>kogito-addons-common-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-tracing-parent</artifactId>
+  <artifactId>kie-addons-tracing-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito :: Add-Ons :: Tracing</name>
+  <name>KIE :: Add-Ons :: Tracing</name>
 
   <modules>
     <module>typedvalue-api</module>
diff --git a/addons/common/tracing/tracing-api/pom.xml 
b/addons/common/tracing/tracing-api/pom.xml
index 8ab694787b..c0150d8505 100644
--- a/addons/common/tracing/tracing-api/pom.xml
+++ b/addons/common/tracing/tracing-api/pom.xml
@@ -23,14 +23,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";>
   <parent>
-    <artifactId>kogito-addons-tracing-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-tracing-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-tracing-api</artifactId>
-  <name>Kogito :: Add-Ons :: Tracing :: API</name>
+  <artifactId>kie-addons-tracing-api</artifactId>
+  <name>KIE :: Add-Ons :: Tracing :: API</name>
 
   <properties>
     <java.module.name>org.kie.kogito.tracing</java.module.name>
@@ -42,8 +42,8 @@
       <artifactId>kogito-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-tracing-typedvalue-api</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-tracing-typedvalue-api</artifactId>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
diff --git a/addons/common/tracing/typedvalue-api/pom.xml 
b/addons/common/tracing/typedvalue-api/pom.xml
index f7c003ab47..bae307dc41 100644
--- a/addons/common/tracing/typedvalue-api/pom.xml
+++ b/addons/common/tracing/typedvalue-api/pom.xml
@@ -23,14 +23,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";>
   <parent>
-    <artifactId>kogito-addons-tracing-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-tracing-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-tracing-typedvalue-api</artifactId>
-  <name>Kogito :: Add-Ons :: TypedValue API</name>
+  <artifactId>kie-addons-tracing-typedvalue-api</artifactId>
+  <name>KIE :: Add-Ons :: TypedValue API</name>
 
   <properties>
     <java.module.name>org.kie.kogito.tracing.typedvalue</java.module.name>
diff --git a/addons/deprecated/README.md b/addons/deprecated/README.md
index 49aed765f7..765713061b 100644
--- a/addons/deprecated/README.md
+++ b/addons/deprecated/README.md
@@ -64,29 +64,29 @@ them in your project.
 
 > [1] Commons Add-ons that are not supposed to be used by end user's projects.
 
-| Add-On Description          | Deprecated Artifact ID               | New 
Artifact ID                           | Since | 
-|-----------------------------|--------------------------------------|-------------------------------------------|-------|
-| Cloud Events Utils [1]      | cloudevents-utils                    | 
kogito-events-api (incorporated to core)  | 1.8.0 |
-| Cloud Events [1]            | kogito-cloudevents-common-addon      | 
kogito-addons-cloudevents                 | 1.8.0 |
-| Events Decisions [1]        | kogito-event-driven-decisions-common | 
kogito-addons-events-decisions            | 1.8.0 |
-| Explainability [1]          | explainability-addon-common          | 
kogito-addons-explainability              | 1.8.0 |
-| Human Task Prediction API   | kogito-task-prediction-api           | 
kogito-addons-human-task-prediction-api   | 1.8.0 |
-| Human Task Prediction Smile | kogito-task-prediction-smile-addon   | 
kogito-addons-human-task-prediction-smile | 1.8.0 |
-| Jobs Api [1]                | jobs-api                             | 
kogito-addons-jobs-api                    | 1.8.0 |
-| Jobs Management [1]         | jobs-management-common               | 
kogito-addons-jobs-management-common      | 1.8.0 |
-| Mail [1]                    | mail-common-addon                    | 
kogito-addons-mail                        | 1.8.0 |
-| Monitoring [1]              | monitoring-core-common               | 
kogito-addons-monitoring-core             | 1.8.0 |
-| Monitoring Elastic [1]      | monitoring-elastic-common            | 
kogito-addons-monitoring-elastic          | 1.8.0 |
-| Monitoring Prometheus [1]   | monitoring-prometheus-common         | 
kogito-addons-monitoring-core             | 1.8.0 |
-| Persistence File System     | filesystem-persistence-addon         | 
kogito-addons-persistence-filesystem      | 1.8.0 | 
-| Persistence Infinispan      | infinispan-persistence-addon         | 
kogito-addons-persistence-infinispan      | 1.8.0 |
-| Persistence JDBC            | jdbc-persistence-addon               | 
kogito-addons-persistence-jdbc            | 1.8.0 |
-| Persistence MongoDB         | mongodb-persistence-addon            | 
kogito-addons-persistence-mongodb         | 1.8.0 | 
-| Persistence PostgreSQL      | postgresql-persistence-addon         | 
kogito-addons-persistence-postgresql      | 1.8.0 |
-| Process Management [1]      | process-management-common            | 
kogito-addons-process-management          | 1.8.0 | 
-| Process SVG [1]             | process-svg-common                   | 
kogito-addons-process-svg                 | 1.8.0 | 
-| REST Exception Handler [1]  | kogito-rest-exception-handler-common | 
kogito-addons-rest-exception-handler      | 1.8.0 | 
-| Task Management [1]         | task-management-common               | 
kogito-addons-task-management             | 1.8.0 | 
-| Tracing Decision API [1]    | tracing-decision-api                 | 
kogito-addons-tracing-decision-api        | 1.8.0 | 
-| Tracing Decision Common [1] | tracing-decision-common              | 
kogito-addons-tracing-decision-common     | 1.8.0 | 
-| Tracing TypedValue API [1]  | typedvalue-api                       | 
kogito-addons-tracing-typedvalue-api      | 1.8.0 |
+| Add-On Description          | Deprecated Artifact ID               | New 
Artifact ID                          | Since | 
+|-----------------------------|--------------------------------------|------------------------------------------|-------|
+| Cloud Events Utils [1]      | cloudevents-utils                    | 
kogito-events-api (incorporated to core) | 1.8.0 |
+| Cloud Events [1]            | kogito-cloudevents-common-addon      | 
kogito-addons-cloudevents                | 1.8.0 |
+| Events Decisions [1]        | kogito-event-driven-decisions-common | 
kie-addons-events-decisions              | 1.8.0 |
+| Explainability [1]          | explainability-addon-common          | 
kie-addons-explainability                | 1.8.0 |
+| Human Task Prediction API   | kogito-task-prediction-api           | 
jbpm-addons-human-task-prediction-api    | 1.8.0 |
+| Human Task Prediction Smile | kogito-task-prediction-smile-addon   | 
jbpm-addons-human-task-prediction-smile  | 1.8.0 |
+| Jobs Api [1]                | jobs-api                             | 
kogito-addons-jobs-api                   | 1.8.0 |
+| Jobs Management [1]         | jobs-management-common               | 
kogito-addons-jobs-management-common     | 1.8.0 |
+| Mail [1]                    | mail-common-addon                    | 
jbpm-addons-mail                         | 1.8.0 |
+| Monitoring [1]              | monitoring-core-common               | 
kie-addons-monitoring-core               | 1.8.0 |
+| Monitoring Elastic [1]      | monitoring-elastic-common            | 
kie-addons-monitoring-elastic            | 1.8.0 |
+| Monitoring Prometheus [1]   | monitoring-prometheus-common         | 
kie-addons-monitoring-core               | 1.8.0 |
+| Persistence File System     | filesystem-persistence-addon         | 
kie-addons-persistence-filesystem        | 1.8.0 | 
+| Persistence Infinispan      | infinispan-persistence-addon         | 
kie-addons-persistence-infinispan        | 1.8.0 |
+| Persistence JDBC            | jdbc-persistence-addon               | 
kie-addons-persistence-jdbc              | 1.8.0 |
+| Persistence MongoDB         | mongodb-persistence-addon            | 
kie-addons-persistence-mongodb           | 1.8.0 | 
+| Persistence PostgreSQL      | postgresql-persistence-addon         | 
kie-addons-persistence-postgresql        | 1.8.0 |
+| Process Management [1]      | process-management-common            | 
kie-addons-process-management            | 1.8.0 | 
+| Process SVG [1]             | process-svg-common                   | 
kie-addons-process-svg                   | 1.8.0 | 
+| REST Exception Handler [1]  | kogito-rest-exception-handler-common | 
kie-addons-rest-exception-handler        | 1.8.0 | 
+| Task Management [1]         | task-management-common               | 
jbpm-addons-task-management              | 1.8.0 | 
+| Tracing Decision API [1]    | tracing-decision-api                 | 
kogito-addons-tracing-decision-api       | 1.8.0 | 
+| Tracing Decision Common [1] | tracing-decision-common              | 
kie-addons-tracing-decision-common       | 1.8.0 | 
+| Tracing TypedValue API [1]  | typedvalue-api                       | 
kie-addons-tracing-typedvalue-api        | 1.8.0 |
diff --git a/addons/pom.xml b/addons/pom.xml
index 99ccea32b3..bc9b366af2 100644
--- a/addons/pom.xml
+++ b/addons/pom.xml
@@ -28,6 +28,9 @@
     <version>999-SNAPSHOT</version>
     <relativePath>../kogito-build/kogito-build-parent/pom.xml</relativePath>
   </parent>
+
+  <groupId>org.kie</groupId>
+
   <artifactId>kogito-addons</artifactId>
   <packaging>pom</packaging>
   <name>Kogito :: Add-Ons</name>
diff --git a/kogito-bom/pom.xml b/kogito-bom/pom.xml
index 1cf4e60c3e..55dd16f183 100755
--- a/kogito-bom/pom.xml
+++ b/kogito-bom/pom.xml
@@ -220,24 +220,24 @@
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-messaging</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-messaging</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-messaging</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-messaging</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-marshallers-avro</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-marshallers-avro</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-marshallers-avro</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-marshallers-avro</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -258,12 +258,12 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-knative-eventing</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-knative-eventing</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
@@ -292,25 +292,25 @@
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-kubernetes</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-kubernetes</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-kubernetes</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-kubernetes</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-kubernetes-service-catalog</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-kubernetes-service-catalog</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-kubernetes-service-catalog</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-kubernetes-service-catalog</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -622,13 +622,13 @@
 
       <!-- Monitoring addon     -->
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-monitoring-prometheus</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-monitoring-prometheus</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-monitoring-prometheus</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-monitoring-prometheus</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -667,19 +667,19 @@
       </dependency>
 
        <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-monitoring-core</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-monitoring-core</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-monitoring-core</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-monitoring-core</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-monitoring-core</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-monitoring-core</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
@@ -707,13 +707,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-monitoring-elastic</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-monitoring-elastic</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-monitoring-elastic</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-monitoring-elastic</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -765,13 +765,13 @@
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-infinispan</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-infinispan</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-infinispan</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-infinispan</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -787,13 +787,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-rocksdb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-rocksdb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-rocksdb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-rocksdb</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -986,25 +986,25 @@
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-postgresql</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-postgresql</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-postgresql</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-postgresql</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-filesystem</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-filesystem</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-filesystem</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-filesystem</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1020,13 +1020,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-mongodb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-mongodb</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1042,13 +1042,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-jdbc</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-jdbc</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-persistence-jdbc</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-persistence-jdbc</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1086,13 +1086,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-events-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-events-mongodb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-events-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-events-mongodb</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1130,13 +1130,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-process-management</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-process-management</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-process-management</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-process-management</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1220,13 +1220,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-task-management</artifactId>
+        <groupId>org.jbpm</groupId>
+        <artifactId>jbpm-addons-task-management</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-task-management</artifactId>
+        <groupId>org.jbpm</groupId>
+        <artifactId>jbpm-addons-task-management</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1297,13 +1297,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-mail</artifactId>
+        <groupId>org.jbpm</groupId>
+        <artifactId>jbpm-addons-mail</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-mail</artifactId>
+        <groupId>org.jbpm</groupId>
+        <artifactId>jbpm-addons-mail</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1341,13 +1341,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-rest-exception-handler</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-rest-exception-handler</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-rest-exception-handler</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-rest-exception-handler</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1376,19 +1376,19 @@
 
       <!-- Process SVG addon     -->
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-process-svg</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-process-svg</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-process-svg</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-process-svg</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-process-svg</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-process-svg</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
       </dependency>
@@ -1428,18 +1428,18 @@
 
       <!--  Jobs management addon    -->
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-jobs-management-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-jobs-management-common</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-jobs-management-common</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
@@ -1621,37 +1621,37 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-jobs-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-jobs-api</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-human-task-prediction-api</artifactId>
+        <groupId>org.jbpm</groupId>
+        <artifactId>jbpm-addons-human-task-prediction-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-human-task-prediction-api</artifactId>
+        <groupId>org.jbpm</groupId>
+        <artifactId>jbpm-addons-human-task-prediction-api</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-human-task-prediction-smile</artifactId>
+        <groupId>org.jbpm</groupId>
+        <artifactId>jbpm-addons-human-task-prediction-smile</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-human-task-prediction-smile</artifactId>
+        <groupId>org.jbpm</groupId>
+        <artifactId>jbpm-addons-human-task-prediction-smile</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -2538,24 +2538,24 @@
 
       <!-- Tracing -->
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-tracing-api</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-tracing-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-tracing-api</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-tracing-api</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-tracing-decision-common</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-tracing-decision-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-tracing-decision-common</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-tracing-decision-common</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -2593,26 +2593,26 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-tracing-typedvalue-api</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-tracing-typedvalue-api</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-tracing-typedvalue-api</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-tracing-typedvalue-api</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <!-- Explainability -->
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-explainability</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-explainability</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-explainability</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-explainability</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -2654,13 +2654,13 @@
 
       <!-- event-driven decisions -->
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-events-decisions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-events-decisions</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-events-decisions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-events-decisions</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -2700,13 +2700,13 @@
 
       <!-- event-driven predictions -->
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-events-predictions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-events-predictions</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-events-predictions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-events-predictions</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -2746,13 +2746,13 @@
 
       <!-- event-driven rules -->
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-events-rules</artifactId>
+        <groupId>org.drools</groupId>
+        <artifactId>drools-addons-events-rules</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-events-rules</artifactId>
+        <groupId>org.drools</groupId>
+        <artifactId>drools-addons-events-rules</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
diff --git 
a/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml 
b/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml
index d0a57eadd5..1aa1202830 100644
--- 
a/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml
+++ 
b/kogito-serverless-workflow/kogito-serverless-workflow-executor-tests/pom.xml
@@ -78,8 +78,8 @@
       <scope>test</scope>
     </dependency>
       <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-rocksdb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-rocksdb</artifactId>
       <scope>test</scope>
     </dependency>
        <dependency>
diff --git a/quarkus/addons/events/decisions/runtime/pom.xml 
b/quarkus/addons/events/decisions/runtime/pom.xml
index 2796f3bd0d..1c8592bd64 100644
--- a/quarkus/addons/events/decisions/runtime/pom.xml
+++ b/quarkus/addons/events/decisions/runtime/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-events-decisions</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-events-decisions</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/quarkus/addons/events/mongodb/runtime/pom.xml 
b/quarkus/addons/events/mongodb/runtime/pom.xml
index d9e90d4605..b260680eab 100644
--- a/quarkus/addons/events/mongodb/runtime/pom.xml
+++ b/quarkus/addons/events/mongodb/runtime/pom.xml
@@ -40,8 +40,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-events-mongodb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-events-mongodb</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/events/predictions/runtime/pom.xml 
b/quarkus/addons/events/predictions/runtime/pom.xml
index eee06487ee..7fba5c9c67 100644
--- a/quarkus/addons/events/predictions/runtime/pom.xml
+++ b/quarkus/addons/events/predictions/runtime/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-events-predictions</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-events-predictions</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/quarkus/addons/events/rules/runtime/pom.xml 
b/quarkus/addons/events/rules/runtime/pom.xml
index 9043f6de05..b1bdce208f 100644
--- a/quarkus/addons/events/rules/runtime/pom.xml
+++ b/quarkus/addons/events/rules/runtime/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-events-rules</artifactId>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-addons-events-rules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/quarkus/addons/explainability/runtime/pom.xml 
b/quarkus/addons/explainability/runtime/pom.xml
index 142646cbbc..5a36104b6b 100644
--- a/quarkus/addons/explainability/runtime/pom.xml
+++ b/quarkus/addons/explainability/runtime/pom.xml
@@ -55,8 +55,8 @@
             <artifactId>kogito-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-explainability</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-explainability</artifactId>
         </dependency>
 
         <dependency>
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml 
b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
index 89fc13cdf7..0f8b22f9f6 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
@@ -38,8 +38,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-kubernetes-service-catalog</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-kubernetes-service-catalog</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -59,8 +59,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-kubernetes-service-catalog</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-kubernetes-service-catalog</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
diff --git 
a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml 
b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml
index d28e82d306..86a2acc9ed 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml
@@ -54,8 +54,8 @@
             <artifactId>kubernetes-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-kubernetes</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-kubernetes</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/jobs/common/messaging/pom.xml 
b/quarkus/addons/jobs/common/messaging/pom.xml
index 9a910b8a94..8f139166b7 100644
--- a/quarkus/addons/jobs/common/messaging/pom.xml
+++ b/quarkus/addons/jobs/common/messaging/pom.xml
@@ -54,7 +54,7 @@
       <artifactId>jobs-service-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-jobs-api</artifactId>
     </dependency>
     <!-- Test dependencies -->
diff --git a/quarkus/addons/jobs/common/rest-callback/pom.xml 
b/quarkus/addons/jobs/common/rest-callback/pom.xml
index fe694489e7..e83959a37b 100644
--- a/quarkus/addons/jobs/common/rest-callback/pom.xml
+++ b/quarkus/addons/jobs/common/rest-callback/pom.xml
@@ -55,7 +55,7 @@
       <artifactId>kogito-services</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-jobs-api</artifactId>
     </dependency>
     <!-- Test dependencies -->
diff --git a/quarkus/addons/jobs/management/runtime/pom.xml 
b/quarkus/addons/jobs/management/runtime/pom.xml
index acf605be99..d63813e0ae 100644
--- a/quarkus/addons/jobs/management/runtime/pom.xml
+++ b/quarkus/addons/jobs/management/runtime/pom.xml
@@ -46,11 +46,11 @@
       <artifactId>jbpm-flow</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-jobs-management-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-jobs-api</artifactId>
     </dependency>
     <dependency>
@@ -103,7 +103,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-jobs-management-common</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/quarkus/addons/jobs/messaging/runtime/pom.xml 
b/quarkus/addons/jobs/messaging/runtime/pom.xml
index b2b60f5f91..36afb0d861 100644
--- a/quarkus/addons/jobs/messaging/runtime/pom.xml
+++ b/quarkus/addons/jobs/messaging/runtime/pom.xml
@@ -66,7 +66,7 @@
       <artifactId>kogito-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-jobs-api</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/knative/eventing/runtime/pom.xml 
b/quarkus/addons/knative/eventing/runtime/pom.xml
index b776132de3..92bc7ce718 100644
--- a/quarkus/addons/knative/eventing/runtime/pom.xml
+++ b/quarkus/addons/knative/eventing/runtime/pom.xml
@@ -43,7 +43,7 @@
       <artifactId>kie-addons-quarkus-messaging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-knative-eventing</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/kubernetes/runtime/pom.xml 
b/quarkus/addons/kubernetes/runtime/pom.xml
index 34c4530a7a..2447f4b5d8 100644
--- a/quarkus/addons/kubernetes/runtime/pom.xml
+++ b/quarkus/addons/kubernetes/runtime/pom.xml
@@ -37,8 +37,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-kubernetes-service-catalog</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-kubernetes-service-catalog</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -57,8 +57,8 @@
       <artifactId>kubernetes-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-kubernetes</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-kubernetes</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/mail/runtime/pom.xml 
b/quarkus/addons/mail/runtime/pom.xml
index c7fb44169e..76150fdc4c 100644
--- a/quarkus/addons/mail/runtime/pom.xml
+++ b/quarkus/addons/mail/runtime/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-mail</artifactId>
+      <groupId>org.jbpm</groupId>
+      <artifactId>jbpm-addons-mail</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/marshallers/avro/runtime/pom.xml 
b/quarkus/addons/marshallers/avro/runtime/pom.xml
index b6f1e2c980..752d5c9936 100644
--- a/quarkus/addons/marshallers/avro/runtime/pom.xml
+++ b/quarkus/addons/marshallers/avro/runtime/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-marshallers-avro</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-marshallers-avro</artifactId>
     </dependency>
      <dependency>
       <groupId>org.kie.kogito</groupId>
diff --git a/quarkus/addons/messaging/common/pom.xml 
b/quarkus/addons/messaging/common/pom.xml
index 63780e8d7f..26b9f4c3d9 100644
--- a/quarkus/addons/messaging/common/pom.xml
+++ b/quarkus/addons/messaging/common/pom.xml
@@ -37,8 +37,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml 
b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
index 945c1b388d..089aa2507f 100644
--- a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
+++ b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
@@ -38,8 +38,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-kubernetes-service-catalog</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-kubernetes-service-catalog</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -60,8 +60,8 @@
             <artifactId>microprofile-config-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-kubernetes-service-catalog</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-kubernetes-service-catalog</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/quarkus/addons/monitoring/core/pom.xml 
b/quarkus/addons/monitoring/core/pom.xml
index 690d50c4ad..a69ebfcacd 100644
--- a/quarkus/addons/monitoring/core/pom.xml
+++ b/quarkus/addons/monitoring/core/pom.xml
@@ -45,8 +45,8 @@
       <artifactId>kogito-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-core</artifactId>
     </dependency>
 
     <!-- test dependencies -->
@@ -66,8 +66,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/quarkus/addons/monitoring/elastic/runtime/pom.xml 
b/quarkus/addons/monitoring/elastic/runtime/pom.xml
index 078085a100..3b1428acb4 100644
--- a/quarkus/addons/monitoring/elastic/runtime/pom.xml
+++ b/quarkus/addons/monitoring/elastic/runtime/pom.xml
@@ -43,8 +43,8 @@
       <artifactId>quarkus-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-elastic</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-elastic</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/quarkus/addons/monitoring/prometheus/runtime/pom.xml 
b/quarkus/addons/monitoring/prometheus/runtime/pom.xml
index 14f5c5700e..d0c93a1458 100644
--- a/quarkus/addons/monitoring/prometheus/runtime/pom.xml
+++ b/quarkus/addons/monitoring/prometheus/runtime/pom.xml
@@ -52,8 +52,8 @@
       <artifactId>quarkus-micrometer-registry-prometheus</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-prometheus</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-prometheus</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/quarkus/addons/persistence/filesystem/runtime/pom.xml 
b/quarkus/addons/persistence/filesystem/runtime/pom.xml
index b05c7a6123..31ad98d5ab 100644
--- a/quarkus/addons/persistence/filesystem/runtime/pom.xml
+++ b/quarkus/addons/persistence/filesystem/runtime/pom.xml
@@ -45,8 +45,8 @@
     </dependency>
     <!-- TODO: for now we have the common persistence Add-On added as a 
dependency, but ideally we should stick with Quarkus way. -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-filesystem</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-filesystem</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/quarkus/addons/persistence/infinispan/runtime/pom.xml 
b/quarkus/addons/persistence/infinispan/runtime/pom.xml
index c41d8832f5..4fc149b625 100644
--- a/quarkus/addons/persistence/infinispan/runtime/pom.xml
+++ b/quarkus/addons/persistence/infinispan/runtime/pom.xml
@@ -45,8 +45,8 @@
     </dependency>
     <!-- TODO: for now we have the common Infinispan Add-On added as a 
dependency, but ideally we should stick with Quarkus way. -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-infinispan</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-infinispan</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/quarkus/addons/persistence/jdbc/runtime/pom.xml 
b/quarkus/addons/persistence/jdbc/runtime/pom.xml
index 7414189ee1..8b2083cc70 100644
--- a/quarkus/addons/persistence/jdbc/runtime/pom.xml
+++ b/quarkus/addons/persistence/jdbc/runtime/pom.xml
@@ -47,8 +47,8 @@
     </dependency>
     <!-- TODO: for now we have the common persistence Add-On added as a 
dependency, but ideally we should stick with Quarkus way. -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-jdbc</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-jdbc</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/persistence/mongodb/runtime/pom.xml 
b/quarkus/addons/persistence/mongodb/runtime/pom.xml
index 2183dd7280..1203339a9f 100644
--- a/quarkus/addons/persistence/mongodb/runtime/pom.xml
+++ b/quarkus/addons/persistence/mongodb/runtime/pom.xml
@@ -45,8 +45,8 @@
     </dependency>
     <!-- TODO: for now we have the common persistence Add-On added as a 
dependency, but ideally we should stick with Quarkus way. -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-mongodb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-mongodb</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/persistence/postgresql/runtime/pom.xml 
b/quarkus/addons/persistence/postgresql/runtime/pom.xml
index b102aa649f..584cc425df 100644
--- a/quarkus/addons/persistence/postgresql/runtime/pom.xml
+++ b/quarkus/addons/persistence/postgresql/runtime/pom.xml
@@ -50,8 +50,8 @@
     </dependency>
     <!-- TODO: for now we have the common persistence Add-On added as a 
dependency, but ideally we should stick with Quarkus way. -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-postgresql</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-postgresql</artifactId>
     </dependency>
     <!--  Flyway  -->
     <dependency>
diff --git 
a/quarkus/addons/persistence/rocksdb/deployment/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/KogitoAddOnPersistenceRocksDBProcessor.java
 
b/quarkus/addons/persistence/rocksdb/deployment/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/KogitoAddOnPersistenceRocksDBProcessor.java
index cd685a4be6..bf9b9f0144 100644
--- 
a/quarkus/addons/persistence/rocksdb/deployment/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/KogitoAddOnPersistenceRocksDBProcessor.java
+++ 
b/quarkus/addons/persistence/rocksdb/deployment/src/main/java/org/kie/kogito/persistence/quarkus/rocksdb/KogitoAddOnPersistenceRocksDBProcessor.java
@@ -40,6 +40,6 @@ class KogitoAddOnPersistenceRocksDBProcessor extends 
OneOfCapabilityKogitoAddOnP
 
     @BuildStep
     IndexDependencyBuildItem addClassToIndex() {
-        return new IndexDependencyBuildItem("org.kie.kogito", 
"kogito-addons-persistence-rocksdb");
+        return new IndexDependencyBuildItem("org.kie", 
"kie-addons-persistence-rocksdb");
     }
 }
diff --git a/quarkus/addons/persistence/rocksdb/runtime/pom.xml 
b/quarkus/addons/persistence/rocksdb/runtime/pom.xml
index f287eb264a..1056cf7965 100644
--- a/quarkus/addons/persistence/rocksdb/runtime/pom.xml
+++ b/quarkus/addons/persistence/rocksdb/runtime/pom.xml
@@ -44,8 +44,8 @@
       <artifactId>quarkus-arc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-rocksdb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-rocksdb</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/quarkus/addons/process-management/runtime/pom.xml 
b/quarkus/addons/process-management/runtime/pom.xml
index 5aef5830c3..f61b4292fe 100644
--- a/quarkus/addons/process-management/runtime/pom.xml
+++ b/quarkus/addons/process-management/runtime/pom.xml
@@ -41,8 +41,8 @@
       <artifactId>quarkus-arc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
diff --git a/quarkus/addons/process-svg/runtime/pom.xml 
b/quarkus/addons/process-svg/runtime/pom.xml
index 09976dbbba..679126431a 100644
--- a/quarkus/addons/process-svg/runtime/pom.xml
+++ b/quarkus/addons/process-svg/runtime/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-process-svg</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-process-svg</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
@@ -81,8 +81,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-process-svg</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-process-svg</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/quarkus/addons/rest-exception-handler/pom.xml 
b/quarkus/addons/rest-exception-handler/pom.xml
index b33ca078c9..a5419789ab 100644
--- a/quarkus/addons/rest-exception-handler/pom.xml
+++ b/quarkus/addons/rest-exception-handler/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-rest-exception-handler</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-rest-exception-handler</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
diff --git a/quarkus/addons/task-management/runtime/pom.xml 
b/quarkus/addons/task-management/runtime/pom.xml
index d3849360e5..d2d08ce37a 100644
--- a/quarkus/addons/task-management/runtime/pom.xml
+++ b/quarkus/addons/task-management/runtime/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-task-management</artifactId>
+      <groupId>org.jbpm</groupId>
+      <artifactId>jbpm-addons-task-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/quarkus/addons/tracing-decision/runtime/pom.xml 
b/quarkus/addons/tracing-decision/runtime/pom.xml
index dc2d36f0ab..c458dc1aeb 100644
--- a/quarkus/addons/tracing-decision/runtime/pom.xml
+++ b/quarkus/addons/tracing-decision/runtime/pom.xml
@@ -64,8 +64,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-tracing-decision-common</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-tracing-decision-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/springboot/addons/events/decisions/pom.xml 
b/springboot/addons/events/decisions/pom.xml
index 2bdacbb22b..bf9d4240a2 100644
--- a/springboot/addons/events/decisions/pom.xml
+++ b/springboot/addons/events/decisions/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-events-decisions</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-events-decisions</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/springboot/addons/events/mongodb/pom.xml 
b/springboot/addons/events/mongodb/pom.xml
index 0139970f8f..f7690cd66f 100644
--- a/springboot/addons/events/mongodb/pom.xml
+++ b/springboot/addons/events/mongodb/pom.xml
@@ -40,8 +40,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-events-mongodb</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-events-mongodb</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/springboot/addons/events/predictions/pom.xml 
b/springboot/addons/events/predictions/pom.xml
index 2d6ce331f3..ceca34b929 100644
--- a/springboot/addons/events/predictions/pom.xml
+++ b/springboot/addons/events/predictions/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-events-predictions</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-events-predictions</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/springboot/addons/events/rules/pom.xml 
b/springboot/addons/events/rules/pom.xml
index a352823616..7649718743 100644
--- a/springboot/addons/events/rules/pom.xml
+++ b/springboot/addons/events/rules/pom.xml
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-events-rules</artifactId>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-addons-events-rules</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/springboot/addons/explainability/pom.xml 
b/springboot/addons/explainability/pom.xml
index 6f5dda2b34..a348befded 100644
--- a/springboot/addons/explainability/pom.xml
+++ b/springboot/addons/explainability/pom.xml
@@ -47,8 +47,8 @@
       <artifactId>kogito-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-explainability</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-explainability</artifactId>
     </dependency>
 
     <dependency>
diff --git a/springboot/addons/jobs/pom.xml b/springboot/addons/jobs/pom.xml
index 119c5b3d63..1254f0d45c 100644
--- a/springboot/addons/jobs/pom.xml
+++ b/springboot/addons/jobs/pom.xml
@@ -45,11 +45,11 @@
       <artifactId>jbpm-flow</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-jobs-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-jobs-management-common</artifactId>
     </dependency>
     <dependency>
@@ -91,7 +91,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-jobs-management-common</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/springboot/addons/kubernetes/pom.xml 
b/springboot/addons/kubernetes/pom.xml
index ce479db0dd..546bf03285 100644
--- a/springboot/addons/kubernetes/pom.xml
+++ b/springboot/addons/kubernetes/pom.xml
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-kubernetes</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-kubernetes</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
diff --git a/springboot/addons/mail/pom.xml b/springboot/addons/mail/pom.xml
index b702ac73e6..b11c1d58b8 100644
--- a/springboot/addons/mail/pom.xml
+++ b/springboot/addons/mail/pom.xml
@@ -50,8 +50,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-mail</artifactId>
+      <groupId>org.jbpm</groupId>
+      <artifactId>jbpm-addons-mail</artifactId>
     </dependency>
 
     <dependency>
diff --git a/springboot/addons/messaging/implementation/pom.xml 
b/springboot/addons/messaging/implementation/pom.xml
index f415d3f208..a488b3ab1a 100644
--- a/springboot/addons/messaging/implementation/pom.xml
+++ b/springboot/addons/messaging/implementation/pom.xml
@@ -37,8 +37,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.kafka</groupId>
diff --git a/springboot/addons/monitoring/core/pom.xml 
b/springboot/addons/monitoring/core/pom.xml
index 3322a1c084..f07c214234 100644
--- a/springboot/addons/monitoring/core/pom.xml
+++ b/springboot/addons/monitoring/core/pom.xml
@@ -37,8 +37,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -67,8 +67,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/springboot/addons/monitoring/elastic/pom.xml 
b/springboot/addons/monitoring/elastic/pom.xml
index ce84aeae4b..b809e6c0b3 100644
--- a/springboot/addons/monitoring/elastic/pom.xml
+++ b/springboot/addons/monitoring/elastic/pom.xml
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-elastic</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-elastic</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/springboot/addons/monitoring/prometheus/pom.xml 
b/springboot/addons/monitoring/prometheus/pom.xml
index 1144fd1661..0a566dbb72 100644
--- a/springboot/addons/monitoring/prometheus/pom.xml
+++ b/springboot/addons/monitoring/prometheus/pom.xml
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-monitoring-prometheus</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-monitoring-prometheus</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie</groupId>
diff --git a/springboot/addons/persistence/filesystem/pom.xml 
b/springboot/addons/persistence/filesystem/pom.xml
index 594e9debd5..c81f3d8a41 100644
--- a/springboot/addons/persistence/filesystem/pom.xml
+++ b/springboot/addons/persistence/filesystem/pom.xml
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-filesystem</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-filesystem</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/springboot/addons/persistence/infinispan/pom.xml 
b/springboot/addons/persistence/infinispan/pom.xml
index 0f9237aeba..0c4ff89b46 100644
--- a/springboot/addons/persistence/infinispan/pom.xml
+++ b/springboot/addons/persistence/infinispan/pom.xml
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-infinispan</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-infinispan</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/springboot/addons/persistence/jdbc/pom.xml 
b/springboot/addons/persistence/jdbc/pom.xml
index e2bec34c5b..12fe4766a3 100644
--- a/springboot/addons/persistence/jdbc/pom.xml
+++ b/springboot/addons/persistence/jdbc/pom.xml
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-jdbc</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-jdbc</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/springboot/addons/persistence/mongodb/pom.xml 
b/springboot/addons/persistence/mongodb/pom.xml
index 37c38d52bc..053d677b08 100644
--- a/springboot/addons/persistence/mongodb/pom.xml
+++ b/springboot/addons/persistence/mongodb/pom.xml
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-mongodb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-mongodb</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/springboot/addons/persistence/postgresql/pom.xml 
b/springboot/addons/persistence/postgresql/pom.xml
index 4ea44f88ea..025fd3e808 100644
--- a/springboot/addons/persistence/postgresql/pom.xml
+++ b/springboot/addons/persistence/postgresql/pom.xml
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-persistence-postgresql</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-persistence-postgresql</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/springboot/addons/process-management/pom.xml 
b/springboot/addons/process-management/pom.xml
index 9a1487e809..ad172306f0 100644
--- a/springboot/addons/process-management/pom.xml
+++ b/springboot/addons/process-management/pom.xml
@@ -44,8 +44,8 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-process-management</artifactId>
     </dependency>
 
     <!-- test dependencies -->
diff --git a/springboot/addons/process-svg/pom.xml 
b/springboot/addons/process-svg/pom.xml
index d70bc4d13a..b2f04a0077 100644
--- a/springboot/addons/process-svg/pom.xml
+++ b/springboot/addons/process-svg/pom.xml
@@ -37,8 +37,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-process-svg</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-process-svg</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -88,8 +88,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-process-svg</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-process-svg</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/springboot/addons/rest-exception-handler/pom.xml 
b/springboot/addons/rest-exception-handler/pom.xml
index 404cc54f4a..fc3b230d04 100644
--- a/springboot/addons/rest-exception-handler/pom.xml
+++ b/springboot/addons/rest-exception-handler/pom.xml
@@ -43,8 +43,8 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-rest-exception-handler</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-rest-exception-handler</artifactId>
     </dependency>
     <!-- test dependencies -->
     <dependency>
diff --git a/springboot/addons/task-management/pom.xml 
b/springboot/addons/task-management/pom.xml
index afd8fa0cc0..49aa4a1cc2 100644
--- a/springboot/addons/task-management/pom.xml
+++ b/springboot/addons/task-management/pom.xml
@@ -48,8 +48,8 @@
       <artifactId>kie-addons-springboot-rest-exception-handler</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-task-management</artifactId>
+      <groupId>org.jbpm</groupId>
+      <artifactId>jbpm-addons-task-management</artifactId>
     </dependency>
 
     <!-- test dependencies -->
diff --git a/springboot/addons/tracing-decision/pom.xml 
b/springboot/addons/tracing-decision/pom.xml
index 77c6998424..221b596ea2 100644
--- a/springboot/addons/tracing-decision/pom.xml
+++ b/springboot/addons/tracing-decision/pom.xml
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-tracing-decision-common</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-tracing-decision-common</artifactId>
     </dependency>
 
     <dependency>
diff --git a/springboot/archetype/README.md b/springboot/archetype/README.md
index 03aab8f47e..2d71d3a5a0 100644
--- a/springboot/archetype/README.md
+++ b/springboot/archetype/README.md
@@ -63,7 +63,7 @@ For a list of valid add-ons, see these listings:
 
 Please note that you don't need to add the suffix `kogito-addons-springboot` 
to the name of the addon. For example, to
 include `kie-addons-springboot-monitoring-prometheus` just use 
`monitoring-prometheus`. For runtime independent
-add-ons, just suppress the `kogito-addons` suffix. So for 
`kogito-addons-persistence-infinispan`
+add-ons, just suppress the `kogito-addons` suffix. So for 
`kie-addons-persistence-infinispan`
 use `persistence-infinispan`.
 
 > You can use `starters` and `addons` together to create a Kogito project that 
 > meets your requirements.
diff --git 
a/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy
 
b/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy
index 44ff5ec5e0..5d502b70fd 100644
--- 
a/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy
+++ 
b/springboot/archetype/src/main/resources/META-INF/archetype-post-generate.groovy
@@ -75,7 +75,7 @@ def addonsToArtifactsIds(String addons) {
             [id: "persistence-jdbc", addon: 
"kie-addons-springboot-persistence-jdbc"],
             [id: "persistence-mongodb", addon: 
"kie-addons-springboot-persistence-mongodb"],
             [id: "persistence-postgresql", addon: 
"kie-addons-springboot-persistence-postgresql"],
-            [id: "human-task-prediction-api", addon: 
"kogito-addons-human-task-prediction-api"],
+            [id: "human-task-prediction-api", addon: 
"jbpm-addons-human-task-prediction-api"],
             [id: "messaging", addon: "kie-addons-springboot-messaging"],
             [id: "events-decisions", addon: 
"kie-addons-springboot-events-decisions"],
             [id: "events-process-kafka", addon: 
"kie-addons-springboot-events-process-kafka"],


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to