From 52715fb14d9792de3cb949bdd1123448641157a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pere=20Fern=C3=A1ndez?= <pefernan@users.noreply.github.com>
Date: Thu, 7 Mar 2024 09:47:34 +0100
Subject: [PATCH] incubator-kie-issues#935: Rename `kie` & `kogito` Quarkus
 Extensions in `kogito-runtimes` (#3420)

* incubator-kie-issues#935: Rename `kie` & `kogito` Quarkus Extensions in `kogito-runtimes`
* fix FEATURE` names
* fix `kogito.addon`s
* align `README.md`
* codestart fix
* more fixes
* fix codestart
---
 addons/README.md                              |   4 +-
 addons/common/events/mongodb/README.md        |  12 +-
 .../V1.35.0__create_runtime_PostgreSQL.sql    |   2 +-
 addons/deprecated/README.md                   |  98 +--
 kogito-bom/pom.xml                            | 648 +++++++++---------
 quarkus/addons/README.md                      |  52 +-
 quarkus/addons/camel/pom.xml                  |   3 +-
 quarkus/addons/common/deployment/pom.xml      |   6 +-
 .../common/deployment/KogitoCapability.java   |   2 +-
 .../pom.xml                                   |   2 +-
 .../pom.xml                                   |   6 +-
 .../pom.xml                                   |   6 +-
 quarkus/addons/common/pom.xml                 |   2 +-
 .../addons/common/reactive-messaging/pom.xml  |   2 +-
 .../events/decisions/deployment/pom.xml       |  18 +-
 .../KogitoAddOnEventDecisionProcessor.java    |   2 +-
 quarkus/addons/events/decisions/pom.xml       |   8 +-
 .../addons/events/decisions/runtime/pom.xml   |  12 +-
 .../src/main/resources/META-INF/kogito.addon  |   2 +-
 .../addons/events/mongodb/deployment/pom.xml  |  14 +-
 .../KogitoAddOnEventMongoDBProcessor.java     |   2 +-
 quarkus/addons/events/mongodb/pom.xml         |   8 +-
 quarkus/addons/events/mongodb/runtime/pom.xml |  10 +-
 quarkus/addons/events/pom.xml                 |   8 +-
 .../events/predictions/deployment/pom.xml     |  18 +-
 .../KogitoAddOnEventPredictionsProcessor.java |   2 +-
 quarkus/addons/events/predictions/pom.xml     |   8 +-
 .../addons/events/predictions/runtime/pom.xml |  12 +-
 .../src/main/resources/META-INF/kogito.addon  |   2 +-
 .../addons/events/process/deployment/pom.xml  |  14 +-
 .../KogitoAddOnEventProcessProcessor.java     |   2 +-
 quarkus/addons/events/process/pom.xml         |   8 +-
 quarkus/addons/events/process/runtime/pom.xml |  12 +-
 .../addons/events/rules/deployment/pom.xml    |   6 +-
 .../rules/KogitoAddOnEventRulesProcessor.java |   2 +-
 quarkus/addons/events/rules/pom.xml           |   4 +-
 quarkus/addons/events/rules/runtime/pom.xml   |   4 +-
 .../src/main/resources/META-INF/kogito.addon  |   2 +-
 .../addons/explainability/deployment/pom.xml  |  14 +-
 .../KogitoAddOnExplainabilityProcessor.java   |   2 +-
 .../explainability/integration-tests/pom.xml  |  16 +-
 quarkus/addons/explainability/pom.xml         |   7 +-
 quarkus/addons/explainability/runtime/pom.xml |   8 +-
 .../deployment/pom.xml                        |   4 +-
 .../pom.xml                                   |   2 +-
 .../runtime/pom.xml                           |   4 +-
 .../test-utils/pom.xml                        |   2 +-
 quarkus/addons/jobs/common/messaging/pom.xml  |   2 +-
 quarkus/addons/jobs/common/pom.xml            |   2 +-
 .../addons/jobs/common/rest-callback/pom.xml  |   2 +-
 .../jobs/knative-eventing/deployment/pom.xml  |  10 +-
 quarkus/addons/jobs/knative-eventing/pom.xml  |   2 +-
 .../jobs/knative-eventing/runtime/pom.xml     |  14 +-
 .../addons/jobs/management/deployment/pom.xml |   6 +-
 quarkus/addons/jobs/management/pom.xml        |   2 +-
 .../addons/jobs/management/runtime/pom.xml    |   4 +-
 .../addons/jobs/messaging/deployment/pom.xml  |   6 +-
 quarkus/addons/jobs/messaging/pom.xml         |   2 +-
 quarkus/addons/jobs/messaging/runtime/pom.xml |   8 +-
 quarkus/addons/jobs/pom.xml                   |   2 +-
 .../knative/eventing/deployment/pom.xml       |  18 +-
 .../KogitoAddOnKnativeEventingProcessor.java  |   2 +-
 .../eventing/integration-tests/pom.xml        |  12 +-
 quarkus/addons/knative/eventing/pom.xml       |   6 +-
 .../addons/knative/eventing/runtime/pom.xml   |  16 +-
 quarkus/addons/knative/pom.xml                |   6 +-
 .../addons/knative/serving/deployment/pom.xml |   8 +-
 .../knative/serving/integration-tests/pom.xml |  14 +-
 quarkus/addons/knative/serving/pom.xml        |   2 +-
 .../addons/knative/serving/runtime/pom.xml    |  14 +-
 quarkus/addons/kubernetes/deployment/pom.xml  |  16 +-
 .../KogitoAddOnKubernetesProcessor.java       |   2 +-
 .../kubernetes/integration-tests/pom.xml      |  20 +-
 quarkus/addons/kubernetes/pom.xml             |   6 +-
 quarkus/addons/kubernetes/runtime/pom.xml     |  14 +-
 quarkus/addons/mail/deployment/pom.xml        |   2 +-
 .../deployment/KogitoAddOnMailProcessor.java  |   2 +-
 quarkus/addons/mail/pom.xml                   |   2 +-
 .../marshallers/avro/deployment/pom.xml       |  14 +-
 quarkus/addons/marshallers/avro/pom.xml       |   8 +-
 .../addons/marshallers/avro/runtime/pom.xml   |  10 +-
 quarkus/addons/marshallers/pom.xml            |   2 +-
 quarkus/addons/messaging/common/pom.xml       |  12 +-
 quarkus/addons/messaging/deployment/pom.xml   |  14 +-
 .../KogitoAddOnMessagingProcessor.java        |   2 +-
 .../messaging/integration-tests/pom.xml       |  16 +-
 quarkus/addons/messaging/pom.xml              |   8 +-
 quarkus/addons/messaging/runtime/pom.xml      |  14 +-
 .../deployment/pom.xml                        |   6 +-
 .../integration-tests/pom.xml                 |   6 +-
 .../pom.xml                                   |   2 +-
 .../runtime/pom.xml                           |   2 +-
 quarkus/addons/monitoring/core/pom.xml        |   8 +-
 .../monitoring/elastic/deployment/pom.xml     |  14 +-
 ...KogitoAddOnMonitoringElasticProcessor.java |   2 +-
 quarkus/addons/monitoring/elastic/pom.xml     |  10 +-
 .../addons/monitoring/elastic/runtime/pom.xml |  12 +-
 quarkus/addons/monitoring/pom.xml             |   8 +-
 .../monitoring/prometheus/deployment/pom.xml  |  14 +-
 ...itoAddOnMonitoringPrometheusProcessor.java |   2 +-
 quarkus/addons/monitoring/prometheus/pom.xml  |  10 +-
 .../monitoring/prometheus/runtime/pom.xml     |  12 +-
 .../persistence/filesystem/deployment/pom.xml |  14 +-
 ...toAddOnPersistenceFileSystemProcessor.java |   2 +-
 quarkus/addons/persistence/filesystem/pom.xml |  10 +-
 .../persistence/filesystem/runtime/pom.xml    |   8 +-
 .../persistence/infinispan/deployment/pom.xml |  14 +-
 ...toAddOnPersistenceInfinispanProcessor.java |   2 +-
 .../persistence/infinispan/health/pom.xml     |   8 +-
 quarkus/addons/persistence/infinispan/pom.xml |  10 +-
 .../persistence/infinispan/runtime/pom.xml    |   8 +-
 .../persistence/jdbc/deployment/pom.xml       |  14 +-
 .../KogitoAddOnPersistenceJDBCProcessor.java  |   2 +-
 quarkus/addons/persistence/jdbc/pom.xml       |  10 +-
 .../addons/persistence/jdbc/runtime/pom.xml   |   8 +-
 .../persistence/kafka/deployment/pom.xml      |  14 +-
 .../KogitoAddOnPersistenceKafkaProcessor.java |   2 +-
 quarkus/addons/persistence/kafka/pom.xml      |  10 +-
 .../addons/persistence/kafka/runtime/pom.xml  |  10 +-
 .../persistence/mongodb/deployment/pom.xml    |  14 +-
 ...ogitoAddOnPersistenceMongoDBProcessor.java |   2 +-
 quarkus/addons/persistence/mongodb/pom.xml    |  10 +-
 .../persistence/mongodb/runtime/pom.xml       |   8 +-
 quarkus/addons/persistence/pom.xml            |   8 +-
 .../persistence/postgresql/deployment/pom.xml |  14 +-
 ...toAddOnPersistencePostgreSQLProcessor.java |   2 +-
 quarkus/addons/persistence/postgresql/pom.xml |  10 +-
 .../persistence/postgresql/runtime/pom.xml    |   8 +-
 .../persistence/rocksdb/deployment/pom.xml    |  14 +-
 ...ogitoAddOnPersistenceRocksDBProcessor.java |   2 +-
 quarkus/addons/persistence/rocksdb/pom.xml    |  10 +-
 .../persistence/rocksdb/runtime/pom.xml       |   8 +-
 quarkus/addons/pom.xml                        |   1 +
 .../process-definitions/deployment/pom.xml    |  14 +-
 .../ProcessDefinitionsProcessor.java          |   2 +-
 quarkus/addons/process-definitions/pom.xml    |   6 +-
 .../process-definitions/runtime/pom.xml       |  12 +-
 .../process-management/deployment/pom.xml     |  14 +-
 ...KogitoAddOnProcessManagementProcessor.java |   2 +-
 .../integration-tests/pom.xml                 |  12 +-
 quarkus/addons/process-management/pom.xml     |   6 +-
 .../addons/process-management/runtime/pom.xml |  12 +-
 quarkus/addons/process-svg/deployment/pom.xml |  14 +-
 .../KogitoAddOnProcessSVGProcessor.java       |   2 +-
 quarkus/addons/process-svg/pom.xml            |   6 +-
 quarkus/addons/process-svg/runtime/pom.xml    |   8 +-
 quarkus/addons/python/deployment/pom.xml      |   2 +-
 quarkus/addons/python/pom.xml                 |   3 +-
 quarkus/addons/rest-exception-handler/pom.xml |   8 +-
 .../addons/source-files/deployment/pom.xml    |  14 +-
 .../KogitoAddOnSourceFilesProcessor.java      |   2 +-
 quarkus/addons/source-files/pom.xml           |   8 +-
 quarkus/addons/source-files/runtime/pom.xml   |  12 +-
 .../addons/task-management/deployment/pom.xml |   2 +-
 .../KogitoAddOnTaskManagementProcessor.java   |   2 +-
 quarkus/addons/task-management/pom.xml        |   2 +-
 .../addons/task-management/runtime/pom.xml    |   4 +-
 .../task-notification/deployment/pom.xml      |   2 +-
 .../KogitoAddOnTaskNotificationProcessor.java |   2 +-
 quarkus/addons/task-notification/pom.xml      |   2 +-
 .../tracing-decision/deployment/pom.xml       |  18 +-
 .../KogitoAddOnTracingDecisionProcessor.java  |   2 +-
 .../integration-tests/pom.xml                 |  16 +-
 quarkus/addons/tracing-decision/pom.xml       |   6 +-
 .../addons/tracing-decision/runtime/pom.xml   |  12 +-
 .../quarkus/dmn/KogitoDMNCodeCodestartIT.java |   8 +-
 .../kogito-quarkus-deployment/pom.xml         |   4 +-
 .../kogito-quarkus/pom.xml                    |   4 +-
 .../pom.xml                                   |  12 +-
 .../pom.xml                                   |  16 +-
 .../kogito-quarkus-predictions/pom.xml        |  10 +-
 .../pom.xml                                   |   5 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |  24 +-
 .../pom.xml                                   |   8 +-
 .../integration-tests-kogito-plugin/pom.xml   |   4 +-
 .../pom.xml                                   |   8 +-
 .../pom.xml                                   |  16 +-
 .../pom.xml                                   |  16 +-
 .../pom.xml                                   |  16 +-
 .../pom.xml                                   |  16 +-
 .../pom.xml                                   |  16 +-
 .../pom.xml                                   |  16 +-
 .../pom.xml                                   |   8 +-
 .../pom.xml                                   |  40 +-
 .../pom.xml                                   |   8 +-
 springboot/addons/README.md                   |  48 +-
 springboot/addons/events/decisions/pom.xml    |  12 +-
 .../src/main/resources/META-INF/kogito.addon  |   2 +-
 springboot/addons/events/kafka/pom.xml        |  10 +-
 springboot/addons/events/mongodb/pom.xml      |  10 +-
 springboot/addons/events/pom.xml              |   8 +-
 springboot/addons/events/predictions/pom.xml  |  12 +-
 .../src/main/resources/META-INF/kogito.addon  |   2 +-
 springboot/addons/events/rules/pom.xml        |   8 +-
 springboot/addons/explainability/pom.xml      |   6 +-
 springboot/addons/jobs/pom.xml                |   2 +-
 springboot/addons/kubernetes/pom.xml          |   6 +-
 springboot/addons/mail/pom.xml                |   2 +-
 .../addons/messaging/implementation/pom.xml   |  10 +-
 .../messaging/integration-tests/pom.xml       |  14 +-
 .../pom.xml                                   |   4 +-
 springboot/addons/messaging/pom.xml           |   8 +-
 springboot/addons/monitoring/core/pom.xml     |   8 +-
 springboot/addons/monitoring/elastic/pom.xml  |  12 +-
 springboot/addons/monitoring/pom.xml          |   8 +-
 .../addons/monitoring/prometheus/pom.xml      |  12 +-
 .../addons/persistence/filesystem/pom.xml     |   8 +-
 .../addons/persistence/infinispan/pom.xml     |   8 +-
 springboot/addons/persistence/jdbc/pom.xml    |   8 +-
 springboot/addons/persistence/mongodb/pom.xml |   8 +-
 springboot/addons/persistence/pom.xml         |   8 +-
 .../addons/persistence/postgresql/pom.xml     |   8 +-
 springboot/addons/pom.xml                     |   1 +
 springboot/addons/process-management/pom.xml  |  10 +-
 springboot/addons/process-svg/pom.xml         |   6 +-
 .../addons/rest-exception-handler/pom.xml     |   8 +-
 springboot/addons/task-management/pom.xml     |   6 +-
 springboot/addons/task-notification/pom.xml   |   2 +-
 springboot/addons/tracing-decision/pom.xml    |  10 +-
 springboot/archetype/README.md                |   4 +-
 springboot/archetype/pom.xml                  |   8 +-
 .../META-INF/archetype-post-generate.groovy   |  34 +-
 .../AddDependencyToPomWithXmlTest.groovy      |   4 +-
 .../projects/it-custom-process/verify.groovy  |   2 +-
 springboot/integration-tests/pom.xml          |  44 +-
 .../pom.xml                                   |   8 +-
 .../pom.xml                                   |   8 +-
 .../pom.xml                                   |  12 +-
 .../pom.xml                                   |   8 +-
 .../pom.xml                                   |   7 +-
 .../pom.xml                                   |   8 +-
 .../pom.xml                                   |   8 +-
 .../pom.xml                                   |   8 +-
 .../pom.xml                                   |   4 +-
 springboot/starters/README.md                 |   4 +-
 .../pom.xml                                   |   7 +-
 .../kogito-spring-boot-starter/pom.xml        |   4 +-
 238 files changed, 1374 insertions(+), 1364 deletions(-)

diff --git a/addons/README.md b/addons/README.md
index 5e17127a9f2..c248666aec7 100644
--- a/addons/README.md
+++ b/addons/README.md
@@ -50,8 +50,8 @@ your `pom.xml` file:
 
 <dependencies>
   <dependency>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-process-management</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-process-management</artifactId>
     <version>${kogito.version}</version>
   </dependency>
 </dependencies>
diff --git a/addons/common/events/mongodb/README.md b/addons/common/events/mongodb/README.md
index 6a20b1d8c15..a4208227d09 100644
--- a/addons/common/events/mongodb/README.md
+++ b/addons/common/events/mongodb/README.md
@@ -21,8 +21,8 @@ To enable this events publisher, make sure dependency for the Kafka events publi
 2. Springboot:
 ```xml
 <dependency>
-  <groupId>org.kie.kogito</groupId>
-  <artifactId>kogito-addons-springboot-events-kafka</artifactId>
+  <groupId>org.kie</groupId>
+  <artifactId>kie-addons-springboot-events-kafka</artifactId>
 </dependency>
 ```
 
@@ -31,15 +31,15 @@ Then add the following dependency for MongoDB events publisher:
 1. Quarkus:
 ```xml
 <dependency>
-  <groupId>org.kie.kogito</groupId>
-  <artifactId>kogito-addons-quarkus-events-mongodb</artifactId>
+  <groupId>org.kie</groupId>
+  <artifactId>kie-addons-quarkus-events-mongodb</artifactId>
 </dependency>
 ```
 
 2. Springboot:
 ```xml
 <dependency>
-  <groupId>org.kie.kogito</groupId>
-  <artifactId>kogito-addons-springboot-events-mongodb</artifactId>
+  <groupId>org.kie</groupId>
+  <artifactId>kie-addons-springboot-events-mongodb</artifactId>
 </dependency>
 ```
\ No newline at end of file
diff --git a/addons/common/persistence/jdbc/src/main/resources/db/postgresql/V1.35.0__create_runtime_PostgreSQL.sql b/addons/common/persistence/jdbc/src/main/resources/db/postgresql/V1.35.0__create_runtime_PostgreSQL.sql
index 892b6734b73..70792ea34af 100644
--- a/addons/common/persistence/jdbc/src/main/resources/db/postgresql/V1.35.0__create_runtime_PostgreSQL.sql
+++ b/addons/common/persistence/jdbc/src/main/resources/db/postgresql/V1.35.0__create_runtime_PostgreSQL.sql
@@ -1,4 +1,4 @@
--- To be used with kogito-addons-quarkus-persistence-jdbc for Quarkus or kogito-addons-springboot-persistence-jdbc for SpringBoot
+-- To be used with kie-addons-quarkus-persistence-jdbc for Quarkus or kie-addons-springboot-persistence-jdbc for SpringBoot
 CREATE TABLE process_instances
 (
     id              character(36)     NOT NULL,
diff --git a/addons/deprecated/README.md b/addons/deprecated/README.md
index 9ffb96a02ff..49aed765f7d 100644
--- a/addons/deprecated/README.md
+++ b/addons/deprecated/README.md
@@ -7,58 +7,58 @@ them in your project.
 
 #### Quarkus Add-ons
 
-| Add-On Description      | Deprecated Artifact ID                      | New Artifact ID                                     | Since  | 
-|-------------------------|---------------------------------------------|-----------------------------------------------------|--------|
-| Cloud Events            | kogito-cloudevents-quarkus-addon            | kogito-addons-quarkus-messaging                     | 1.8.0  |
-| Cloud Events Common     | kogito-cloudevents-quarkus-common-addon     | kogito-addons-quarkus-messaging-common              | 1.8.0  |
-| Cloud Events Multi      | kogito-cloudevents-quarkus-multi-addon      | kogito-addons-quarkus-messaging                     | 1.8.0  | 
-| Events Decisions        | kogito-event-driven-decisions-quarkus-addon | kogito-addons-quarkus-events-decisions              | 1.8.0  | 
-| Events Smallrye         | kogito-events-reactive-messaging-addon      | kogito-addons-quarkus-events-process                | 1.8.0  |
-| Explainability          | explainability-quarkus-addon                | kogito-addons-quarkus-explainability                | 1.8.0  | 
-| Jobs Management         | jobs-management-quarkus-addon               | kogito-addons-quarkus-jobs-management               | 1.8.0  | 
-| Knative Eventing        | knative-eventing-addon                      | kogito-addons-quarkus-knative-eventing              | 1.6.0  |
-| Mail                    | mail-quarkus-addon                          | jbpm-addons-quarkus-mail                            | 1.8.0  |
-| Monitoring Core         | monitoring-core-quarkus-addon               | kogito-addons-quarkus-monitoring-core               | 1.8.0  | 
-| Monitoring Elastic      | monitoring-elastic-quarkus-addon            | kogito-addons-quarkus-monitoring-elastic            | 1.8.0  | 
-| Monitoring Prometheus   | monitoring-prometheus-quarkus-addon         | kogito-addons-quarkus-monitoring-prometheus         | 1.8.0  | 
-| Persistence ISPN Health | infinispan-quarkus-health-addon             | kogito-addons-quarkus-persistence-infinispan-health | 1.8.0  |
-| Persistence Infinispan  | kogito-addons-persistence-infinispan        | kogito-addons-quarkus-persistence-infinispan        | 1.12.0 |
-| Persistence Kafka       | kafka-persistence-addon                     | kogito-addons-quarkus-persistence-kafka             | 1.8.0  |
-| Persistence FileSystem  | kogito-addons-persistence-filesystem        | kogito-addons-quarkus-persistence-filesystem        | 1.12.0 |
-| Persistence JDBC        | kogito-addons-persistence-jdbc              | kogito-addons-quarkus-persistence-jdbc              | 1.12.0 |
-| Persistence MongoDB     | kogito-addons-persistence-mongodb           | kogito-addons-quarkus-persistence-mongodb           | 1.12.0 |
-| Persistence Postgresql  | kogito-addons-persistence-postgresql        | kogito-addons-quarkus-persistence-postgresql        | 1.12.0 |
-| Process Management      | process-management-addon                    | kogito-addons-quarkus-process-management            | 1.8.0  | 
-| Process SVG             | process-svg-quarkus-addon                   | kogito-addons-quarkus-process-svg                   | 1.8.0  | 
-| REST Exception Handler  | kogito-rest-exception-handler-quarkus       | kogito-addons-quarkus-rest-exception-handler        | 1.8.0  | 
-| Task Management         | task-management-quarkus-addon               | jbpm-addons-quarkus-task-management                 | 1.8.0  | 
-| Task Notification       | task-notification-quarkus-addon             | jbpm-addons-quarkus-task-notification               | 1.8.0  | 
-| Tracing Decision        | tracing-decision-quarkus-addon              | kogito-addons-quarkus-tracing-decision              | 1.8.0  | 
+| Add-On Description      | Deprecated Artifact ID                      | New Artifact ID                                  | Since  | 
+|-------------------------|---------------------------------------------|--------------------------------------------------|--------|
+| Cloud Events            | kogito-cloudevents-quarkus-addon            | kie-addons-quarkus-messaging                     | 1.8.0  |
+| Cloud Events Common     | kogito-cloudevents-quarkus-common-addon     | kie-addons-quarkus-messaging-common              | 1.8.0  |
+| Cloud Events Multi      | kogito-cloudevents-quarkus-multi-addon      | kie-addons-quarkus-messaging                     | 1.8.0  | 
+| Events Decisions        | kogito-event-driven-decisions-quarkus-addon | kie-addons-quarkus-events-decisions              | 1.8.0  | 
+| Events Smallrye         | kogito-events-reactive-messaging-addon      | kie-addons-quarkus-events-process                | 1.8.0  |
+| Explainability          | explainability-quarkus-addon                | kie-addons-quarkus-explainability                | 1.8.0  | 
+| Jobs Management         | jobs-management-quarkus-addon               | kogito-addons-quarkus-jobs-management            | 1.8.0  | 
+| Knative Eventing        | knative-eventing-addon                      | kie-addons-quarkus-knative-eventing              | 1.6.0  |
+| Mail                    | mail-quarkus-addon                          | jbpm-addons-quarkus-mail                         | 1.8.0  |
+| Monitoring Core         | monitoring-core-quarkus-addon               | kie-addons-quarkus-monitoring-core               | 1.8.0  | 
+| Monitoring Elastic      | monitoring-elastic-quarkus-addon            | kie-addons-quarkus-monitoring-elastic            | 1.8.0  | 
+| Monitoring Prometheus   | monitoring-prometheus-quarkus-addon         | kie-addons-quarkus-monitoring-prometheus         | 1.8.0  | 
+| Persistence ISPN Health | infinispan-quarkus-health-addon             | kie-addons-quarkus-persistence-infinispan-health | 1.8.0  |
+| Persistence Infinispan  | kogito-addons-persistence-infinispan        | kie-addons-quarkus-persistence-infinispan        | 1.12.0 |
+| Persistence Kafka       | kafka-persistence-addon                     | kie-addons-quarkus-persistence-kafka             | 1.8.0  |
+| Persistence FileSystem  | kogito-addons-persistence-filesystem        | kie-addons-quarkus-persistence-filesystem        | 1.12.0 |
+| Persistence JDBC        | kogito-addons-persistence-jdbc              | kie-addons-quarkus-persistence-jdbc              | 1.12.0 |
+| Persistence MongoDB     | kogito-addons-persistence-mongodb           | kie-addons-quarkus-persistence-mongodb           | 1.12.0 |
+| Persistence Postgresql  | kogito-addons-persistence-postgresql        | kie-addons-quarkus-persistence-postgresql        | 1.12.0 |
+| Process Management      | process-management-addon                    | kie-addons-quarkus-process-management            | 1.8.0  | 
+| Process SVG             | process-svg-quarkus-addon                   | kie-addons-quarkus-process-svg                   | 1.8.0  | 
+| REST Exception Handler  | kogito-rest-exception-handler-quarkus       | kie-addons-quarkus-rest-exception-handler        | 1.8.0  | 
+| Task Management         | task-management-quarkus-addon               | jbpm-addons-quarkus-task-management              | 1.8.0  | 
+| Task Notification       | task-notification-quarkus-addon             | jbpm-addons-quarkus-task-notification            | 1.8.0  | 
+| Tracing Decision        | tracing-decision-quarkus-addon              | kie-addons-quarkus-tracing-decision              | 1.8.0  | 
 
 #### Spring Boot Add-ons
 
-| Add-On Description      | Deprecated Artifact ID                         | New Artifact ID                                 | Since  | 
-|-------------------------|------------------------------------------------|-------------------------------------------------|--------|
-| Cloud Events            | kogito-cloudevents-spring-boot-addon           | kogito-addons-springboot-messaging              | 1.8.0  |
-| Events Decisions        | kogito-event-driven-decisions-springboot-addon | kogito-addons-springboot-events-decisions       | 1.8.0  |
-| Events Kafka            | kogito-events-spring-boot-addon                | kogito-addons-springboot-events-process-kafka   | 1.8.0  |
-| Explainability          | explainability-springboot-addon                | kogito-addons-springboot-explainability         | 1.8.0  | 
-| Jobs Management         | jobs-management-springboot-addon               | kogito-addons-springboot-jobs-management        | 1.8.0  |
-| Mail                    | mail-springboot-addon                          | jbpm-addons-springboot-mail                     | 1.8.0  |
-| Monitoring Core         | monitoring-core-springboot-addon               | kogito-addons-springboot-monitoring-core        | 1.8.0  | 
-| Monitoring Elastic      | monitoring-elastic-springboot-addon            | kogito-addons-springboot-monitoring-elastic     | 1.8.0  | 
-| Monitoring Prometheus   | monitoring-prometheus-springboot-addon         | kogito-addons-springboot-monitoring-prometheus  | 1.8.0  |
-| Process Management      | process-management-springboot-addon            | kogito-addons-springboot-process-management     | 1.8.0  | 
-| Process SVG             | process-svg-springboot-addon                   | kogito-addons-springboot-process-svg            | 1.8.0  |
-| Persistence File System | kogito-addons-persistence-filesystem           | kogito-addons-springboot-persistence-filesystem | 1.21.0 |
-| Persistence Infinispan  | kogito-addons-persistence-infinispan           | kogito-addons-springboot-persistence-infinispan | 1.21.0 |
-| Persistence JDBC        | kogito-addons-persistence-jdbc                 | kogito-addons-springboot-persistence-jdbc       | 1.21.0 |
-| Persistence MongoDB     | kogito-addons-persistence-mongodb              | kogito-addons-springboot-persistence-mongodb    | 1.21.0 |
-| Persistence Postgresql  | kogito-addons-persistence-postgresql           | kogito-addons-springboot-persistence-postgresql | 1.21.0 |
-| REST Exception Handler  | kogito-rest-exception-handler-springboot       | kogito-addons-springboot-rest-exception-handler | 1.8.0  | 
-| Task Management         | task-management-springboot-addon               | jbpm-addons-springboot-task-management          | 1.8.0  | 
-| Task Notification       | task-notification-springboot-addon             | jbpm-addons-springboot-task-notification        | 1.8.0  | 
-| Tracing Decision        | tracing-decision-springboot-addon              | kogito-addons-springboot-tracing-decision       | 1.8.0  | 
+| Add-On Description      | Deprecated Artifact ID                         | New Artifact ID                                | Since  | 
+|-------------------------|------------------------------------------------|------------------------------------------------|--------|
+| Cloud Events            | kogito-cloudevents-spring-boot-addon           | kie-addons-springboot-messaging                | 1.8.0  |
+| Events Decisions        | kogito-event-driven-decisions-springboot-addon | kie-addons-springboot-events-decisions         | 1.8.0  |
+| Events Kafka            | kogito-events-spring-boot-addon                | kie-addons-springboot-events-process-kafka     | 1.8.0  |
+| Explainability          | explainability-springboot-addon                | kie-addons-springboot-explainability           | 1.8.0  | 
+| Jobs Management         | jobs-management-springboot-addon               | kogito-addons-springboot-jobs-management       | 1.8.0  |
+| Mail                    | mail-springboot-addon                          | jbpm-addons-springboot-mail                    | 1.8.0  |
+| Monitoring Core         | monitoring-core-springboot-addon               | kie-addons-springboot-monitoring-core          | 1.8.0  | 
+| Monitoring Elastic      | monitoring-elastic-springboot-addon            | kie-addons-springboot-monitoring-elastic       | 1.8.0  | 
+| Monitoring Prometheus   | monitoring-prometheus-springboot-addon         | kie-addons-springboot-monitoring-prometheus    | 1.8.0  |
+| Process Management      | process-management-springboot-addon            | kie-addons-springboot-process-management       | 1.8.0  | 
+| Process SVG             | process-svg-springboot-addon                   | kie-addons-springboot-process-svg              | 1.8.0  |
+| Persistence File System | kogito-addons-persistence-filesystem           | kie-addons-springboot-persistence-filesystem   | 1.21.0 |
+| Persistence Infinispan  | kogito-addons-persistence-infinispan           | kie-addons-springboot-persistence-infinispan   | 1.21.0 |
+| Persistence JDBC        | kogito-addons-persistence-jdbc                 | kie-addons-springboot-persistence-jdbc         | 1.21.0 |
+| Persistence MongoDB     | kogito-addons-persistence-mongodb              | kie-addons-springboot-persistence-mongodb      | 1.21.0 |
+| Persistence Postgresql  | kogito-addons-persistence-postgresql           | kie-addons-springboot-persistence-postgresql   | 1.21.0 |
+| REST Exception Handler  | kogito-rest-exception-handler-springboot       | kie-addons-springboot-rest-exception-handler   | 1.8.0  | 
+| Task Management         | task-management-springboot-addon               | jbpm-addons-springboot-task-management         | 1.8.0  | 
+| Task Notification       | task-notification-springboot-addon             | jbpm-addons-springboot-task-notification       | 1.8.0  | 
+| Tracing Decision        | tracing-decision-springboot-addon              | kie-addons-springboot-tracing-decision         | 1.8.0  | 
 
 #### Common Add-ons
 
diff --git a/kogito-bom/pom.xml b/kogito-bom/pom.xml
index 56cbfc4e53c..8301f6c4019 100755
--- a/kogito-bom/pom.xml
+++ b/kogito-bom/pom.xml
@@ -242,18 +242,18 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-marshallers-avro</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-marshallers-avro</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-marshallers-avro-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-marshallers-avro-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-marshallers-avro-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-marshallers-avro-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -316,199 +316,199 @@
       </dependency>
 
       <dependency>
-          <groupId>org.kie.kogito</groupId>
+          <groupId>org.kie</groupId>
           <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog</artifactId>
           <version>${project.version}</version>
       </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog</artifactId>
             <version>${project.version}</version>
             <classifier>sources</classifier>
         </dependency>
 
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-deployment</artifactId>
             <version>${project.version}</version>
         </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-microprofile-config-service-catalog</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-microprofile-config-service-catalog</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-microprofile-config-service-catalog-deployment</artifactId>
         <version>${project.version}</version>
         <type>pom</type>
       </dependency>
 
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
             <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-common-reactive-messaging</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-common-reactive-messaging</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-knative-eventing</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-knative-eventing</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-knative-eventing</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-knative-eventing</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-knative-eventing-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-knative-eventing-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-knative-eventing-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-knative-eventing-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-knative-serving</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-knative-serving</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-knative-serving-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-knative-serving-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-kubernetes</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-kubernetes</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-kubernetes</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-kubernetes</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-kubernetes-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-kubernetes-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-kubernetes-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-kubernetes-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-test-utils</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-test-utils</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-kubernetes</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-kubernetes</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-kubernetes</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-kubernetes</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-messaging</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-messaging</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-messaging</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-messaging</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-messaging-common</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-messaging-common</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-messaging-common</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-messaging-common</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-messaging</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-messaging</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-messaging</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-messaging</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -633,35 +633,35 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-monitoring-prometheus</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-monitoring-prometheus</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-monitoring-prometheus</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-monitoring-prometheus</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-monitoring-prometheus-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-monitoring-prometheus-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-monitoring-prometheus-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-monitoring-prometheus-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-monitoring-prometheus</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-monitoring-prometheus</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-monitoring-prometheus</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-monitoring-prometheus</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -685,24 +685,24 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-monitoring-core</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-monitoring-core</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-monitoring-core</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-monitoring-core</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-monitoring-core</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-monitoring-core</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-monitoring-core</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-monitoring-core</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -718,35 +718,35 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-monitoring-elastic</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-monitoring-elastic</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-monitoring-elastic</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-monitoring-elastic</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-monitoring-elastic-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-monitoring-elastic-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-monitoring-elastic-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-monitoring-elastic-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-monitoring-elastic</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-monitoring-elastic</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-monitoring-elastic</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-monitoring-elastic</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -776,13 +776,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-persistence-infinispan</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-persistence-infinispan</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-persistence-infinispan</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-persistence-infinispan</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -798,189 +798,189 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-kafka</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-kafka</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-kafka</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-kafka</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-kafka-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-kafka-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-kafka-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-kafka-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-infinispan</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-infinispan</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-infinispan</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-infinispan</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-infinispan-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-infinispan-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-infinispan-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-infinispan-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-infinispan-health</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-infinispan-health</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-infinispan-health</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-infinispan-health</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-jdbc</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-jdbc</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-jdbc</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-jdbc</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-persistence-jdbc</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-persistence-jdbc</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-persistence-jdbc</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-persistence-jdbc</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-jdbc-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-jdbc-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-jdbc-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-jdbc-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-mongodb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-mongodb</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-mongodb-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-mongodb-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-mongodb-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-mongodb-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-rocksdb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-rocksdb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-rocksdb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-rocksdb</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-rocksdb-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-rocksdb-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-rocksdb-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-rocksdb-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-postgresql</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-postgresql</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-postgresql</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-postgresql</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-postgresql-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-postgresql-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-postgresql-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-postgresql-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-persistence-postgresql</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-persistence-postgresql</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-persistence-postgresql</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-persistence-postgresql</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-filesystem</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-filesystem</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-filesystem</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-filesystem</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-filesystem-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-filesystem-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-persistence-filesystem-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-persistence-filesystem-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1009,13 +1009,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-persistence-filesystem</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-persistence-filesystem</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-persistence-filesystem</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-persistence-filesystem</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1031,13 +1031,13 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-persistence-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-persistence-mongodb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-persistence-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-persistence-mongodb</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1053,35 +1053,35 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-process</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-process</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-process</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-process</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-process-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-process-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-process-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-process-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-events-process-kafka</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-events-process-kafka</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-events-process-kafka</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-events-process-kafka</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1097,35 +1097,35 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-mongodb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-mongodb</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-mongodb-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-mongodb-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-mongodb-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-mongodb-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-events-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-events-mongodb</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-events-mongodb</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-events-mongodb</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1141,81 +1141,81 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-management</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-management</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-management</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-management</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-definitions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-definitions</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-definitions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-definitions</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-definitions-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-definitions-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-definitions-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-definitions-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-source-files</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-source-files</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-source-files</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-source-files</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-source-files-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-source-files-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-source-files-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-source-files-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-process-management</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-process-management</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-process-management</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-process-management</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1352,24 +1352,24 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-rest-exception-handler</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-rest-exception-handler</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-rest-exception-handler</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-rest-exception-handler</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-rest-exception-handler</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-rest-exception-handler</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-rest-exception-handler</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-rest-exception-handler</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1393,35 +1393,35 @@
         <type>test-jar</type>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-svg</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-svg</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-svg</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-svg</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-svg-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-svg-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-process-svg-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-process-svg-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-process-svg</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-process-svg</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-process-svg</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-process-svg</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1446,147 +1446,147 @@
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-rest-callback</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-rest-callback</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-common-messaging</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-common-messaging</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-common-messaging</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-management</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-management</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-management-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-management-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-messaging</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-messaging</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-messaging-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-messaging-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-knative-eventing</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-knative-eventing</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-knative-eventing-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-knative-eventing-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-common-health</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-common-health</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-common-health</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-service-health</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-jobs-service-health</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-data-index-health</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-data-index-health</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-springboot-jobs-management</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-springboot-jobs-management</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
@@ -2120,8 +2120,8 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-predictions-spring-boot-starter</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-predictions-spring-boot-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
 
@@ -2186,19 +2186,19 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-quarkus-predictions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-quarkus-predictions</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-quarkus-predictions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-quarkus-predictions</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-quarkus-predictions-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-quarkus-predictions-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
 
@@ -2560,35 +2560,35 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-tracing-decision</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-tracing-decision</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-tracing-decision</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-tracing-decision</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-tracing-decision-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-tracing-decision-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-tracing-decision-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-tracing-decision-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-tracing-decision</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-tracing-decision</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-tracing-decision</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-tracing-decision</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -2618,36 +2618,36 @@
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-explainability</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-explainability</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-explainability</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-explainability</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
 
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-explainability</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-explainability</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-explainability</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-explainability</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-explainability-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-explainability-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-explainability-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-explainability-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -2665,35 +2665,35 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-decisions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-decisions</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-decisions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-decisions</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-decisions-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-decisions-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-decisions-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-decisions-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-events-decisions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-events-decisions</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-events-decisions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-events-decisions</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -2711,35 +2711,35 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-predictions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-predictions</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-predictions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-predictions</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-predictions-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-predictions-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-events-predictions-deployment</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-events-predictions-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-events-predictions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-events-predictions</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-springboot-events-predictions</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-events-predictions</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
diff --git a/quarkus/addons/README.md b/quarkus/addons/README.md
index 6c39bce5ef9..5a575158ac1 100644
--- a/quarkus/addons/README.md
+++ b/quarkus/addons/README.md
@@ -4,32 +4,32 @@ In this module you will find all the add-ons supported by the community for Quar
 
 <!-- Please update this table in alphabetical order when creating a new add-on -->
 
-| Add-On Description     | Artifact ID                                  | Since  |
-|------------------------|----------------------------------------------|--------|
-| Events Decisions       | kogito-addons-quarkus-events-decisions       | 1.2.0  |
-| Events Predictions     | kogito-addons-quarkus-events-predictions     | 1.12.0 |
-| Events Rules           | drools-addons-quarkus-events-rules           | 1.12.0 |
-| Events Smallrye        | kogito-addons-quarkus-events-smallrye        | 0.3.0  |
-| Explainability         | kogito-addons-quarkus-explainability         | 0.15.0 |
-| Jobs Management        | kogito-addons-quarkus-jobs-management        | 0.6.0  |
-| Knative Eventing       | kogito-addons-quarkus-knative-eventing       | 1.10.0 |
-| Kubernetes             | kogito-addons-quarkus-kubernetes             | 1.13.0 |
-| Mail                   | jbpm-addons-quarkus-mail                     | 1.6.0  |
-| Messaging              | kogito-addons-quarkus-messaging              | 1.0.0  |
-| Monitoring Elastic     | kogito-addons-quarkus-monitoring-elastic     | 1.2.0  |
-| Monitoring Prometheus  | kogito-addons-quarkus-monitoring-prometheus  | 0.1.0  |
-| Persistence FileSystem | kogito-addons-quarkus-persistence-filesystem | 1.12.0 |
-| Persistence Infinispan | kogito-addons-quarkus-persistence-infinispan | 1.12.0 |
-| Persistence JDBC       | kogito-addons-quarkus-persistence-jdbc       | 1.12.0 |
-| Persistence Kafka      | kogito-addons-quarkus-persistence-kafka      | 1.4.0  |
-| Persistence MongoDB    | kogito-addons-quarkus-persistence-mongodb    | 1.12.0 |
-| Persistence Postgresql | kogito-addons-quarkus-persistence-postgresql | 1.12.0 |
-| Process Management     | kogito-addons-quarkus-process-management     | 0.3.0  |
-| Process SVG            | kogito-addons-quarkus-process-svg            | 1.0.0  |
-| Task Management        | jbpm-addons-quarkus-task-management          | 1.4.0  |
-| Task Notification      | jbpm-addons-quarkus-task-notification        | 1.6.0  |
-| Tracing Decision       | kogito-addons-quarkus-tracing-decision       | 0.11.0 |
-| Events MongoDB         | kogito-addons-quarkus-events-mongodb         | 1.11.0 |
+| Add-On Description     | Artifact ID                                 | Since  |
+|------------------------|---------------------------------------------|--------|
+| Events Decisions       | kie-addons-quarkus-events-decisions      | 1.2.0  |
+| Events Predictions     | kogito-addons-quarkus-events-predictions    | 1.12.0 |
+| Events Rules           | drools-addons-quarkus-events-rules          | 1.12.0 |
+| Events Smallrye        | kogito-addons-quarkus-events-smallrye       | 0.3.0  |
+| Explainability         | kie-addons-quarkus-explainability           | 0.15.0 |
+| Jobs Management        | kogito-addons-quarkus-jobs-management       | 0.6.0  |
+| Knative Eventing       | kie-addons-quarkus-knative-eventing         | 1.10.0 |
+| Kubernetes             | kie-addons-quarkus-kubernetes               | 1.13.0 |
+| Mail                   | jbpm-addons-quarkus-mail                    | 1.6.0  |
+| Messaging              | kie-addons-quarkus-messaging                | 1.0.0  |
+| Monitoring Elastic     | kie-addons-quarkus-monitoring-elastic       | 1.2.0  |
+| Monitoring Prometheus  | kie-addons-quarkus-monitoring-prometheus    | 0.1.0  |
+| Persistence FileSystem | kie-addons-quarkus-persistence-filesystem   | 1.12.0 |
+| Persistence Infinispan | kie-addons-quarkus-persistence-infinispan   | 1.12.0 |
+| Persistence JDBC       | kie-addons-quarkus-persistence-jdbc         | 1.12.0 |
+| Persistence Kafka      | kie-addons-quarkus-persistence-kafka        | 1.4.0  |
+| Persistence MongoDB    | kie-addons-quarkus-persistence-mongodb      | 1.12.0 |
+| Persistence Postgresql | kie-addons-quarkus-persistence-postgresql   | 1.12.0 |
+| Process Management     | kie-addons-quarkus-process-management       | 0.3.0  |
+| Process SVG            | kie-addons-quarkus-process-svg              | 1.0.0  |
+| Task Management        | jbpm-addons-quarkus-task-management         | 1.4.0  |
+| Task Notification      | jbpm-addons-quarkus-task-notification       | 1.6.0  |
+| Tracing Decision       | kie-addons-quarkus-tracing-decision         | 0.11.0 |
+| Events MongoDB         | kogito-addons-quarkus-events-mongodb        | 1.11.0 |
 
 ## Contributing
 
diff --git a/quarkus/addons/camel/pom.xml b/quarkus/addons/camel/pom.xml
index a74bb233108..7097935411f 100644
--- a/quarkus/addons/camel/pom.xml
+++ b/quarkus/addons/camel/pom.xml
@@ -24,11 +24,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>kogito-addons-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
+  <groupId>org.kie.kogito</groupId>
   <artifactId>kogito-addons-quarkus-camel-parent</artifactId>
   <name>Kogito :: Add-Ons :: Quarkus :: Camel :: Parent</name>
   <description>Kogito Quarkus Camel Integration with Serverless Workflow</description>
diff --git a/quarkus/addons/common/deployment/pom.xml b/quarkus/addons/common/deployment/pom.xml
index fcb2ad70fc1..4efe993885c 100644
--- a/quarkus/addons/common/deployment/pom.xml
+++ b/quarkus/addons/common/deployment/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-quarkus-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-quarkus-common-deployment</artifactId>
-  <name>Kogito Add-On Common - Deployment</name>
-  <description>Common libraries meant to be used with Kogito Quarkus Add-Ons deployment modules</description>
+  <name>KIE Add-On Common - Deployment</name>
+  <description>Common libraries meant to be used with KIE Quarkus Add-Ons deployment modules</description>
 
   <properties>
      <java.module.name>org.kie.kogito.quarkus.addons.common.deployment</java.module.name>
diff --git a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapability.java b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapability.java
index b62a7c0d19c..04fc92c3dd1 100644
--- a/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapability.java
+++ b/quarkus/addons/common/deployment/src/main/java/org/kie/kogito/quarkus/addons/common/deployment/KogitoCapability.java
@@ -30,7 +30,7 @@ public final class KogitoCapability {
     public static final String KOGITO_GROUP_ID = "org.kie.kogito";
     public static final KogitoCapability DECISIONS = new KogitoCapability("org.drools.decisions", "drools-quarkus-decisions");
     public static final KogitoCapability PROCESSES = new KogitoCapability("org.jbpm.processes", "jbpm-quarkus");
-    public static final KogitoCapability PREDICTIONS = new KogitoCapability("org.kie.predictions", "kogito-quarkus-predictions");
+    public static final KogitoCapability PREDICTIONS = new KogitoCapability("org.kie.predictions", "kie-quarkus-predictions");
     public static final KogitoCapability RULES = new KogitoCapability("org.drools.rules", "drools-quarkus-rules");
     public static final KogitoCapability SERVERLESS_WORKFLOW = new KogitoCapability("org.sonataflow.serverless-workflow", "kogito-quarkus-serverless-workflow");
 
diff --git a/quarkus/addons/common/kogito-addons-quarkus-common-health/pom.xml b/quarkus/addons/common/kogito-addons-quarkus-common-health/pom.xml
index 3c26dd501cc..d375bfd345e 100644
--- a/quarkus/addons/common/kogito-addons-quarkus-common-health/pom.xml
+++ b/quarkus/addons/common/kogito-addons-quarkus-common-health/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-common-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
diff --git a/quarkus/addons/common/kogito-addons-quarkus-data-index-health/pom.xml b/quarkus/addons/common/kogito-addons-quarkus-data-index-health/pom.xml
index 5dc9de2e827..e4d0ec3f084 100644
--- a/quarkus/addons/common/kogito-addons-quarkus-data-index-health/pom.xml
+++ b/quarkus/addons/common/kogito-addons-quarkus-data-index-health/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-common-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
@@ -25,7 +25,7 @@
             <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-common-health</artifactId>
         </dependency>
         <!-- Testing dependencies -->
@@ -55,7 +55,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-common-health</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/quarkus/addons/common/kogito-addons-quarkus-jobs-service-health/pom.xml b/quarkus/addons/common/kogito-addons-quarkus-jobs-service-health/pom.xml
index 424ebdc3154..2fc3db65431 100644
--- a/quarkus/addons/common/kogito-addons-quarkus-jobs-service-health/pom.xml
+++ b/quarkus/addons/common/kogito-addons-quarkus-jobs-service-health/pom.xml
@@ -2,7 +2,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-common-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
@@ -25,7 +25,7 @@
             <artifactId>smallrye-mutiny-vertx-web-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-common-health</artifactId>
         </dependency>
         <!-- Testing dependencies -->
@@ -55,7 +55,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-common-health</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
diff --git a/quarkus/addons/common/pom.xml b/quarkus/addons/common/pom.xml
index db5c7b12e74..0af269c4af4 100644
--- a/quarkus/addons/common/pom.xml
+++ b/quarkus/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/quarkus/addons/common/reactive-messaging/pom.xml b/quarkus/addons/common/reactive-messaging/pom.xml
index 30d8cd6f3c4..387fd85a7e2 100644
--- a/quarkus/addons/common/reactive-messaging/pom.xml
+++ b/quarkus/addons/common/reactive-messaging/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-quarkus-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/quarkus/addons/events/decisions/deployment/pom.xml b/quarkus/addons/events/decisions/deployment/pom.xml
index fe3067d066d..7a12f4a95e7 100644
--- a/quarkus/addons/events/decisions/deployment/pom.xml
+++ b/quarkus/addons/events/decisions/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-events-decisions-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-decisions-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-events-decisions-deployment</artifactId>
-  <name>Kogito Add-On Events Decisions - Deployment</name>
+  <artifactId>kie-addons-quarkus-events-decisions-deployment</artifactId>
+  <name>KIE Add-On Events Decisions - Deployment</name>
 
   <properties>
      <java.module.name>org.kie.kogito.eventdriven.decision</java.module.name>
@@ -40,16 +40,16 @@
       <artifactId>quarkus-arc-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-events-decisions</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-events-decisions</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/quarkus/addons/events/decisions/deployment/src/main/java/org/kie/kogito/eventdriven/decision/KogitoAddOnEventDecisionProcessor.java b/quarkus/addons/events/decisions/deployment/src/main/java/org/kie/kogito/eventdriven/decision/KogitoAddOnEventDecisionProcessor.java
index d83aed2aaf3..56e3b115e82 100644
--- a/quarkus/addons/events/decisions/deployment/src/main/java/org/kie/kogito/eventdriven/decision/KogitoAddOnEventDecisionProcessor.java
+++ b/quarkus/addons/events/decisions/deployment/src/main/java/org/kie/kogito/eventdriven/decision/KogitoAddOnEventDecisionProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnEventDecisionProcessor extends RequireCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-events-decisions-extension";
+    private static final String FEATURE = "kie-addon-events-decisions-extension";
 
     KogitoAddOnEventDecisionProcessor() {
         super(KogitoCapability.DECISIONS);
diff --git a/quarkus/addons/events/decisions/pom.xml b/quarkus/addons/events/decisions/pom.xml
index 5eb0f548f9e..9f50d063d6e 100644
--- a/quarkus/addons/events/decisions/pom.xml
+++ b/quarkus/addons/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-quarkus-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-events-decisions-parent</artifactId>
-  <name>Kogito Add-On Events Decisions - Parent</name>
+  <artifactId>kie-addons-quarkus-events-decisions-parent</artifactId>
+  <name>KIE Add-On Events Decisions - Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/events/decisions/runtime/pom.xml b/quarkus/addons/events/decisions/runtime/pom.xml
index c237efb0b85..2796f3bd0d7 100644
--- a/quarkus/addons/events/decisions/runtime/pom.xml
+++ b/quarkus/addons/events/decisions/runtime/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-quarkus-events-decisions-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-decisions-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-events-decisions</artifactId>
-  <name>Kogito Add-On Events Decisions</name>
+  <artifactId>kie-addons-quarkus-events-decisions</artifactId>
+  <name>KIE Add-On Events Decisions</name>
 
   <properties>
      <java.module.name>org.kie.kogito.eventdriven.decision</java.module.name>
@@ -42,8 +42,8 @@
       <artifactId>kogito-addons-events-decisions</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/kogito.addon b/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/kogito.addon
index be27a1abf6b..0d2fc6c0ac8 100644
--- a/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/kogito.addon
+++ b/quarkus/addons/events/decisions/runtime/src/main/resources/META-INF/kogito.addon
@@ -1 +1 @@
-kogito-event-driven-decisions
\ No newline at end of file
+event-driven-decisions
\ No newline at end of file
diff --git a/quarkus/addons/events/mongodb/deployment/pom.xml b/quarkus/addons/events/mongodb/deployment/pom.xml
index 7d33369d731..36fe75a2786 100644
--- a/quarkus/addons/events/mongodb/deployment/pom.xml
+++ b/quarkus/addons/events/mongodb/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-events-mongodb-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-mongodb-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-events-mongodb-deployment</artifactId>
-  <name>Kogito Add-On Events MongoDB - Deployment</name>
+  <artifactId>kie-addons-quarkus-events-mongodb-deployment</artifactId>
+  <name>KIE Add-On Events MongoDB - Deployment</name>
 
   <properties>
      <java.module.name>org.kie.kogito.events.mongodb.deployment</java.module.name>
@@ -40,11 +40,11 @@
       <artifactId>quarkus-arc-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-events-mongodb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-events-mongodb</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/events/mongodb/deployment/src/main/java/org/kie/kogito/events/mongodb/deployment/KogitoAddOnEventMongoDBProcessor.java b/quarkus/addons/events/mongodb/deployment/src/main/java/org/kie/kogito/events/mongodb/deployment/KogitoAddOnEventMongoDBProcessor.java
index ad33d81175e..6616e35d314 100644
--- a/quarkus/addons/events/mongodb/deployment/src/main/java/org/kie/kogito/events/mongodb/deployment/KogitoAddOnEventMongoDBProcessor.java
+++ b/quarkus/addons/events/mongodb/deployment/src/main/java/org/kie/kogito/events/mongodb/deployment/KogitoAddOnEventMongoDBProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnEventMongoDBProcessor extends RequireCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-events-mongodb-extension";
+    private static final String FEATURE = "kie-addon-events-mongodb-extension";
 
     @BuildStep
     FeatureBuildItem feature() {
diff --git a/quarkus/addons/events/mongodb/pom.xml b/quarkus/addons/events/mongodb/pom.xml
index eb2a8d9a663..d5ee9bd4744 100644
--- a/quarkus/addons/events/mongodb/pom.xml
+++ b/quarkus/addons/events/mongodb/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-quarkus-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-events-mongodb-parent</artifactId>
-  <name>Kogito Add-On Events MongoDB - Parent</name>
+  <artifactId>kie-addons-quarkus-events-mongodb-parent</artifactId>
+  <name>KIE Add-On Events MongoDB - Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/events/mongodb/runtime/pom.xml b/quarkus/addons/events/mongodb/runtime/pom.xml
index e2ca47cbdad..d9e90d46055 100644
--- a/quarkus/addons/events/mongodb/runtime/pom.xml
+++ b/quarkus/addons/events/mongodb/runtime/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-quarkus-events-mongodb-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-mongodb-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-events-mongodb</artifactId>
-  <name>Kogito Add-On Events MongoDB</name>
-  <description>Kogito Events based on MongoDB and Quarkus Add-On</description>
+  <artifactId>kie-addons-quarkus-events-mongodb</artifactId>
+  <name>KIE Add-On Events MongoDB</name>
+  <description>KIE Events based on MongoDB and Quarkus Add-On</description>
 
   <properties>
      <java.module.name>org.kie.kogito.events.mongodb</java.module.name>
diff --git a/quarkus/addons/events/pom.xml b/quarkus/addons/events/pom.xml
index 7d9875bab1b..3d526b48cd7 100644
--- a/quarkus/addons/events/pom.xml
+++ b/quarkus/addons/events/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-events-parent</artifactId>
-  <name>Kogito :: Add-Ons :: Quarkus :: Events</name>
-  <description>Kogito Events Addons for Quarkus Runtime</description>
+  <artifactId>kie-addons-quarkus-events-parent</artifactId>
+  <name>KIE :: Add-Ons :: Quarkus :: Events</name>
+  <description>KIE Events Addons for Quarkus Runtime</description>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/events/predictions/deployment/pom.xml b/quarkus/addons/events/predictions/deployment/pom.xml
index 5101173c250..403b958d167 100644
--- a/quarkus/addons/events/predictions/deployment/pom.xml
+++ b/quarkus/addons/events/predictions/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-events-predictions-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-predictions-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-events-predictions-deployment</artifactId>
-  <name>Kogito Add-On Events Predictions - Deployment</name>
+  <artifactId>kie-addons-quarkus-events-predictions-deployment</artifactId>
+  <name>KIE Add-On Events Predictions - Deployment</name>
 
   <properties>
      <java.module.name>org.kie.kogito.eventdriven.predictions</java.module.name>
@@ -40,16 +40,16 @@
       <artifactId>quarkus-arc-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-events-predictions</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-events-predictions</artifactId>
     </dependency>
   </dependencies>
   <build>
diff --git a/quarkus/addons/events/predictions/deployment/src/main/java/org/kie/kogito/eventdriven/predictions/KogitoAddOnEventPredictionsProcessor.java b/quarkus/addons/events/predictions/deployment/src/main/java/org/kie/kogito/eventdriven/predictions/KogitoAddOnEventPredictionsProcessor.java
index eb8d4a5effe..e1b35cc84ea 100644
--- a/quarkus/addons/events/predictions/deployment/src/main/java/org/kie/kogito/eventdriven/predictions/KogitoAddOnEventPredictionsProcessor.java
+++ b/quarkus/addons/events/predictions/deployment/src/main/java/org/kie/kogito/eventdriven/predictions/KogitoAddOnEventPredictionsProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnEventPredictionsProcessor extends RequireCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-events-predictions-extension";
+    private static final String FEATURE = "kie-addon-events-predictions-extension";
 
     KogitoAddOnEventPredictionsProcessor() {
         super(KogitoCapability.PREDICTIONS);
diff --git a/quarkus/addons/events/predictions/pom.xml b/quarkus/addons/events/predictions/pom.xml
index 18cc7a59ca5..1d49df3c308 100644
--- a/quarkus/addons/events/predictions/pom.xml
+++ b/quarkus/addons/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-quarkus-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-events-predictions-parent</artifactId>
-  <name>Kogito Add-On Events Predictions - Parent</name>
+  <artifactId>kie-addons-quarkus-events-predictions-parent</artifactId>
+  <name>KIE Add-On Events Predictions - Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/events/predictions/runtime/pom.xml b/quarkus/addons/events/predictions/runtime/pom.xml
index 250aaf82c8f..eee06487ee9 100644
--- a/quarkus/addons/events/predictions/runtime/pom.xml
+++ b/quarkus/addons/events/predictions/runtime/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-quarkus-events-predictions-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-predictions-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-events-predictions</artifactId>
-  <name>Kogito Add-On Events Predictions</name>
+  <artifactId>kie-addons-quarkus-events-predictions</artifactId>
+  <name>KIE Add-On Events Predictions</name>
 
   <properties>
      <java.module.name>org.kie.kogito.eventdriven.predictions</java.module.name>
@@ -42,8 +42,8 @@
       <artifactId>kogito-addons-events-predictions</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/kogito.addon b/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/kogito.addon
index 7ca1ca812ef..8ec135f490f 100644
--- a/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/kogito.addon
+++ b/quarkus/addons/events/predictions/runtime/src/main/resources/META-INF/kogito.addon
@@ -1 +1 @@
-kogito-event-driven-predictions
\ No newline at end of file
+event-driven-predictions
\ No newline at end of file
diff --git a/quarkus/addons/events/process/deployment/pom.xml b/quarkus/addons/events/process/deployment/pom.xml
index e759cf6b2f3..2ada823050e 100644
--- a/quarkus/addons/events/process/deployment/pom.xml
+++ b/quarkus/addons/events/process/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-events-process-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-process-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-events-process-deployment</artifactId>
-  <name>Kogito Add-On Events Process - Deployment</name>
+  <artifactId>kie-addons-quarkus-events-process-deployment</artifactId>
+  <name>KIE Add-On Events Process - Deployment</name>
 
   <properties>
      <java.module.name>org.kie.kogito.events.process.deployment</java.module.name>
@@ -40,11 +40,11 @@
       <artifactId>quarkus-arc-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-events-process</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-events-process</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/events/process/deployment/src/main/java/org/kie/kogito/events/process/deployment/KogitoAddOnEventProcessProcessor.java b/quarkus/addons/events/process/deployment/src/main/java/org/kie/kogito/events/process/deployment/KogitoAddOnEventProcessProcessor.java
index 4f2fd414e3d..09974979e7f 100644
--- a/quarkus/addons/events/process/deployment/src/main/java/org/kie/kogito/events/process/deployment/KogitoAddOnEventProcessProcessor.java
+++ b/quarkus/addons/events/process/deployment/src/main/java/org/kie/kogito/events/process/deployment/KogitoAddOnEventProcessProcessor.java
@@ -32,7 +32,7 @@
 
 class KogitoAddOnEventProcessProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-events-process-extension";
+    private static final String FEATURE = "kie-addon-events-process-extension";
 
     KogitoAddOnEventProcessProcessor() {
         super(KogitoCapability.PROCESSES, KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/events/process/pom.xml b/quarkus/addons/events/process/pom.xml
index 11273f500f2..17ac3cfa0cc 100644
--- a/quarkus/addons/events/process/pom.xml
+++ b/quarkus/addons/events/process/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-quarkus-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-events-process-parent</artifactId>
-  <name>Kogito Add-On Events Process - Parent</name>
+  <artifactId>kie-addons-quarkus-events-process-parent</artifactId>
+  <name>KIE Add-On Events Process - Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/events/process/runtime/pom.xml b/quarkus/addons/events/process/runtime/pom.xml
index b46bcf62f95..dc5d417218d 100644
--- a/quarkus/addons/events/process/runtime/pom.xml
+++ b/quarkus/addons/events/process/runtime/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-quarkus-events-process-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-process-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-events-process</artifactId>
-  <name>Kogito Add-On Events Process</name>
-  <description>Kogito Add-On for runtime process events</description>
+  <artifactId>kie-addons-quarkus-events-process</artifactId>
+  <name>KIE Add-On Events Process</name>
+  <description>KIE Add-On for runtime process events</description>
 
   <properties>
      <java.module.name>org.kie.kogito.events</java.module.name>
@@ -45,7 +45,7 @@
       <artifactId>kogito-services</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-reactive-messaging</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/events/rules/deployment/pom.xml b/quarkus/addons/events/rules/deployment/pom.xml
index eec1086401d..a1167e8680c 100644
--- a/quarkus/addons/events/rules/deployment/pom.xml
+++ b/quarkus/addons/events/rules/deployment/pom.xml
@@ -41,12 +41,12 @@
       <artifactId>quarkus-jackson-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
     </dependency>
     <dependency>
       <groupId>org.drools</groupId>
diff --git a/quarkus/addons/events/rules/deployment/src/main/java/org/kie/kogito/eventdriven/rules/KogitoAddOnEventRulesProcessor.java b/quarkus/addons/events/rules/deployment/src/main/java/org/kie/kogito/eventdriven/rules/KogitoAddOnEventRulesProcessor.java
index 9de3dcdd746..8d47e4a8848 100644
--- a/quarkus/addons/events/rules/deployment/src/main/java/org/kie/kogito/eventdriven/rules/KogitoAddOnEventRulesProcessor.java
+++ b/quarkus/addons/events/rules/deployment/src/main/java/org/kie/kogito/eventdriven/rules/KogitoAddOnEventRulesProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnEventRulesProcessor extends RequireCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-events-rules-extension";
+    private static final String FEATURE = "drools-addon-events-rules-extension";
 
     KogitoAddOnEventRulesProcessor() {
         super(KogitoCapability.RULES);
diff --git a/quarkus/addons/events/rules/pom.xml b/quarkus/addons/events/rules/pom.xml
index 5b357a55d09..fe1a9c46ad9 100644
--- a/quarkus/addons/events/rules/pom.xml
+++ b/quarkus/addons/events/rules/pom.xml
@@ -24,8 +24,8 @@
          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-quarkus-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
diff --git a/quarkus/addons/events/rules/runtime/pom.xml b/quarkus/addons/events/rules/runtime/pom.xml
index 725429b51d1..9043f6de051 100644
--- a/quarkus/addons/events/rules/runtime/pom.xml
+++ b/quarkus/addons/events/rules/runtime/pom.xml
@@ -42,8 +42,8 @@
       <artifactId>kogito-addons-events-rules</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/kogito.addon b/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/kogito.addon
index 99442916153..308ce6ce4a6 100644
--- a/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/kogito.addon
+++ b/quarkus/addons/events/rules/runtime/src/main/resources/META-INF/kogito.addon
@@ -1 +1 @@
-kogito-event-driven-rules
\ No newline at end of file
+event-driven-rules
\ No newline at end of file
diff --git a/quarkus/addons/explainability/deployment/pom.xml b/quarkus/addons/explainability/deployment/pom.xml
index 0955beaa7d6..c31cf2e65f0 100644
--- a/quarkus/addons/explainability/deployment/pom.xml
+++ b/quarkus/addons/explainability/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-explainability-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-explainability-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-explainability-deployment</artifactId>
-  <name>Kogito Add-On Explainability - Deployment</name>
+  <artifactId>kie-addons-quarkus-explainability-deployment</artifactId>
+  <name>KIE Add-On Explainability - Deployment</name>
 
   <properties>
      <java.module.name>org.kie.kogito.explainability.deployment</java.module.name>
@@ -44,11 +44,11 @@
       <artifactId>quarkus-resteasy-jackson-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-explainability</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-explainability</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
   </dependencies>
diff --git a/quarkus/addons/explainability/deployment/src/main/java/org/kie/kogito/explainability/deployment/KogitoAddOnExplainabilityProcessor.java b/quarkus/addons/explainability/deployment/src/main/java/org/kie/kogito/explainability/deployment/KogitoAddOnExplainabilityProcessor.java
index 86b3d26957d..188cb435b93 100644
--- a/quarkus/addons/explainability/deployment/src/main/java/org/kie/kogito/explainability/deployment/KogitoAddOnExplainabilityProcessor.java
+++ b/quarkus/addons/explainability/deployment/src/main/java/org/kie/kogito/explainability/deployment/KogitoAddOnExplainabilityProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnExplainabilityProcessor extends RequireCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-explainability-extension";
+    private static final String FEATURE = "kie-addon-explainability-extension";
 
     KogitoAddOnExplainabilityProcessor() {
         super(KogitoCapability.DECISIONS);
diff --git a/quarkus/addons/explainability/integration-tests/pom.xml b/quarkus/addons/explainability/integration-tests/pom.xml
index 4fa1876cb7e..8214fc5201d 100644
--- a/quarkus/addons/explainability/integration-tests/pom.xml
+++ b/quarkus/addons/explainability/integration-tests/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>
-    <artifactId>kogito-addons-quarkus-explainability-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-explainability-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-explainability-it</artifactId>
-  <name>Kogito Add-On Explainability - Integration tests</name>
+  <artifactId>kie-addons-quarkus-explainability-it</artifactId>
+  <name>KIE Add-On Explainability - Integration tests</name>
 
   <properties>
      <java.module.name>org.kie.kogito.explainability.test</java.module.name>
@@ -52,8 +52,8 @@
       <artifactId>drools-quarkus-decisions</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-explainability</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-explainability</artifactId>
     </dependency>
     <!-- this is used implicitly by parallel builds so let's make Maven aware of it -->
     <dependency>
@@ -70,8 +70,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-explainability-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-explainability-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/addons/explainability/pom.xml b/quarkus/addons/explainability/pom.xml
index bf9e725513b..c0aa807d8ff 100644
--- a/quarkus/addons/explainability/pom.xml
+++ b/quarkus/addons/explainability/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>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-explainability-parent</artifactId>
-  <name>Kogito Add-On Explainability - Parent</name>
+  <artifactId>kie-addons-quarkus-explainability-parent</artifactId>
+  <name>KIE Add-On Explainability - Parent</name>
+
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/explainability/runtime/pom.xml b/quarkus/addons/explainability/runtime/pom.xml
index 3b8328cb12f..142646cbbc0 100644
--- a/quarkus/addons/explainability/runtime/pom.xml
+++ b/quarkus/addons/explainability/runtime/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-quarkus-explainability-parent</artifactId>
-        <groupId>org.kie.kogito</groupId>
+        <artifactId>kie-addons-quarkus-explainability-parent</artifactId>
+        <groupId>org.kie</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kogito-addons-quarkus-explainability</artifactId>
-    <name>Kogito Add-On Explainability</name>
+    <artifactId>kie-addons-quarkus-explainability</artifactId>
+    <name>KIE Add-On Explainability</name>
 
   <properties>
      <java.module.name>org.kie.kogito.explainability</java.module.name>
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml
index 23081f7a0a8..4535fa8c29b 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/pom.xml
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/deployment/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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
@@ -38,7 +38,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog</artifactId>
         </dependency>
         <dependency>
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/pom.xml
index f15b61e2abb..129e038d7f4 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/pom.xml
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
diff --git a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
index a95857a6ebd..89fc13cdf73 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/pom.xml
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/runtime/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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
@@ -91,7 +91,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-test-utils</artifactId>
             <scope>test</scope>
         </dependency>
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 b03f9c73743..d28e82d3063 100644
--- a/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml
+++ b/quarkus/addons/fabric8-kubernetes-service-catalog/test-utils/pom.xml
@@ -24,7 +24,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
diff --git a/quarkus/addons/jobs/common/messaging/pom.xml b/quarkus/addons/jobs/common/messaging/pom.xml
index 65f658482d8..9a910b8a942 100644
--- a/quarkus/addons/jobs/common/messaging/pom.xml
+++ b/quarkus/addons/jobs/common/messaging/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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-jobs-common-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/quarkus/addons/jobs/common/pom.xml b/quarkus/addons/jobs/common/pom.xml
index 1e5c4d75ae6..05bf8991bc2 100644
--- a/quarkus/addons/jobs/common/pom.xml
+++ b/quarkus/addons/jobs/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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-jobs-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/quarkus/addons/jobs/common/rest-callback/pom.xml b/quarkus/addons/jobs/common/rest-callback/pom.xml
index b6e74931783..fe694489e78 100644
--- a/quarkus/addons/jobs/common/rest-callback/pom.xml
+++ b/quarkus/addons/jobs/common/rest-callback/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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-jobs-common-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/quarkus/addons/jobs/knative-eventing/deployment/pom.xml b/quarkus/addons/jobs/knative-eventing/deployment/pom.xml
index dfbbb3754d7..cf3e85036a5 100644
--- a/quarkus/addons/jobs/knative-eventing/deployment/pom.xml
+++ b/quarkus/addons/jobs/knative-eventing/deployment/pom.xml
@@ -23,7 +23,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-jobs-knative-eventing-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
@@ -48,15 +48,15 @@
       <artifactId>quarkus-reactive-messaging-http-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-knative-eventing-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-knative-eventing-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-jobs-knative-eventing</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/jobs/knative-eventing/pom.xml b/quarkus/addons/jobs/knative-eventing/pom.xml
index 3fead709030..a7d9fbcb609 100644
--- a/quarkus/addons/jobs/knative-eventing/pom.xml
+++ b/quarkus/addons/jobs/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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-jobs-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/quarkus/addons/jobs/knative-eventing/runtime/pom.xml b/quarkus/addons/jobs/knative-eventing/runtime/pom.xml
index c65514a29d7..9d64fd2d2b0 100644
--- a/quarkus/addons/jobs/knative-eventing/runtime/pom.xml
+++ b/quarkus/addons/jobs/knative-eventing/runtime/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-quarkus-jobs-knative-eventing-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
@@ -62,19 +62,19 @@
       <artifactId>quarkus-reactive-messaging-http</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-knative-eventing</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-knative-eventing</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-jobs-common-messaging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-rest-callback</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-jobs-service-health</artifactId>
     </dependency>
     <!-- Test dependencies -->
@@ -99,7 +99,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-jobs-common-messaging</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/quarkus/addons/jobs/management/deployment/pom.xml b/quarkus/addons/jobs/management/deployment/pom.xml
index b81dfb94cec..deb8adcc0f7 100644
--- a/quarkus/addons/jobs/management/deployment/pom.xml
+++ b/quarkus/addons/jobs/management/deployment/pom.xml
@@ -23,7 +23,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-jobs-management-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
@@ -44,11 +44,11 @@
       <artifactId>quarkus-vertx-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-jobs-management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/jobs/management/pom.xml b/quarkus/addons/jobs/management/pom.xml
index 7c951403b50..10e907c55a8 100644
--- a/quarkus/addons/jobs/management/pom.xml
+++ b/quarkus/addons/jobs/management/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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-jobs-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/quarkus/addons/jobs/management/runtime/pom.xml b/quarkus/addons/jobs/management/runtime/pom.xml
index b71ac7ebd6b..acf605be996 100644
--- a/quarkus/addons/jobs/management/runtime/pom.xml
+++ b/quarkus/addons/jobs/management/runtime/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-quarkus-jobs-management-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
@@ -54,7 +54,7 @@
       <artifactId>kogito-addons-jobs-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-rest-callback</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/jobs/messaging/deployment/pom.xml b/quarkus/addons/jobs/messaging/deployment/pom.xml
index f397ca51547..85f34759918 100644
--- a/quarkus/addons/jobs/messaging/deployment/pom.xml
+++ b/quarkus/addons/jobs/messaging/deployment/pom.xml
@@ -23,7 +23,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-jobs-messaging-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
@@ -48,11 +48,11 @@
       <artifactId>quarkus-smallrye-reactive-messaging-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-jobs-messaging</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/jobs/messaging/pom.xml b/quarkus/addons/jobs/messaging/pom.xml
index b3cb76d11ff..87ec9da4afc 100644
--- a/quarkus/addons/jobs/messaging/pom.xml
+++ b/quarkus/addons/jobs/messaging/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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-jobs-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/quarkus/addons/jobs/messaging/runtime/pom.xml b/quarkus/addons/jobs/messaging/runtime/pom.xml
index acc10e320f6..b2b60f5f91b 100644
--- a/quarkus/addons/jobs/messaging/runtime/pom.xml
+++ b/quarkus/addons/jobs/messaging/runtime/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-quarkus-jobs-messaging-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
@@ -70,11 +70,11 @@
       <artifactId>kogito-addons-jobs-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-jobs-common-messaging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-rest-callback</artifactId>
     </dependency>
 
@@ -100,7 +100,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-jobs-common-messaging</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/quarkus/addons/jobs/pom.xml b/quarkus/addons/jobs/pom.xml
index 34974911169..62ca4849398 100644
--- a/quarkus/addons/jobs/pom.xml
+++ b/quarkus/addons/jobs/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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/quarkus/addons/knative/eventing/deployment/pom.xml b/quarkus/addons/knative/eventing/deployment/pom.xml
index e3a5aa2e386..c21404d0034 100644
--- a/quarkus/addons/knative/eventing/deployment/pom.xml
+++ b/quarkus/addons/knative/eventing/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-knative-eventing-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-knative-eventing-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-knative-eventing-deployment</artifactId>
-  <name>Kogito Add-On Knative Eventing - Deployment</name>
+  <artifactId>kie-addons-quarkus-knative-eventing-deployment</artifactId>
+  <name>KIE Add-On Knative Eventing - Deployment</name>
 
   <properties>
      <java.module.name>org.kie.kogito.addons.quarkus.knative.eventing.deployment</java.module.name>
@@ -36,8 +36,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-knative-eventing</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-knative-eventing</artifactId>
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
@@ -61,7 +61,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
@@ -69,8 +69,8 @@
       <artifactId>kogito-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/knative/eventing/deployment/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessor.java b/quarkus/addons/knative/eventing/deployment/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessor.java
index 7f07f77457f..1587962ba38 100644
--- a/quarkus/addons/knative/eventing/deployment/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessor.java
+++ b/quarkus/addons/knative/eventing/deployment/src/main/java/org/kie/kogito/addons/quarkus/knative/eventing/deployment/KogitoAddOnKnativeEventingProcessor.java
@@ -57,7 +57,7 @@
 
 public class KogitoAddOnKnativeEventingProcessor extends AnyEngineKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-knative-eventing-extension";
+    private static final String FEATURE = "kie-addon-knative-eventing-extension";
     /**
      * Name of the generated file
      */
diff --git a/quarkus/addons/knative/eventing/integration-tests/pom.xml b/quarkus/addons/knative/eventing/integration-tests/pom.xml
index 948970e3cf9..390871a8a03 100644
--- a/quarkus/addons/knative/eventing/integration-tests/pom.xml
+++ b/quarkus/addons/knative/eventing/integration-tests/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-quarkus-knative-eventing-parent</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-knative-eventing-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kogito-addons-quarkus-knative-eventing-integration-tests</artifactId>
-    <name>Kogito Add-On Knative Eventing - Integration Tests</name>
+    <artifactId>kie-addons-quarkus-knative-eventing-integration-tests</artifactId>
+    <name>KIE Add-On Knative Eventing - Integration Tests</name>
 
   <properties>
      <java.module.name>org.kie.kogito.addons.quarkus.knative.eventing.test</java.module.name>
@@ -54,8 +54,8 @@
             <artifactId>kogito-quarkus-serverless-workflow</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-quarkus-knative-eventing</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-quarkus-knative-eventing</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/knative/eventing/pom.xml b/quarkus/addons/knative/eventing/pom.xml
index cd459cc9fc5..eba886f3c77 100644
--- a/quarkus/addons/knative/eventing/pom.xml
+++ b/quarkus/addons/knative/eventing/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>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-knative-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-knative-eventing-parent</artifactId>
-  <name>Kogito Add-On Knative Eventing - Parent</name>
+  <artifactId>kie-addons-quarkus-knative-eventing-parent</artifactId>
+  <name>KIE Add-On Knative Eventing - Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/knative/eventing/runtime/pom.xml b/quarkus/addons/knative/eventing/runtime/pom.xml
index 27e99c1112a..b776132de3f 100644
--- a/quarkus/addons/knative/eventing/runtime/pom.xml
+++ b/quarkus/addons/knative/eventing/runtime/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-quarkus-knative-eventing-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-knative-eventing-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-knative-eventing</artifactId>
-  <name>Kogito Add-On Knative Eventing</name>
-  <description>Knative Eventing Kogito Add-On. Adds support for CloudEvents on top of HTTP and Knative env vars configuration.</description>
+  <artifactId>kie-addons-quarkus-knative-eventing</artifactId>
+  <name>KIE Add-On Knative Eventing</name>
+  <description>Knative Eventing KIE Add-On. Adds support for CloudEvents on top of HTTP and Knative env vars configuration.</description>
 
   <properties>
      <java.module.name>org.kie.kogito.addons.quarkus.knative.eventing</java.module.name>
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -57,7 +57,7 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-data-index-health</artifactId>
     </dependency>
     <!-- Testing dependencies -->
diff --git a/quarkus/addons/knative/pom.xml b/quarkus/addons/knative/pom.xml
index def779d31b6..8ad10039661 100644
--- a/quarkus/addons/knative/pom.xml
+++ b/quarkus/addons/knative/pom.xml
@@ -24,14 +24,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <artifactId>kogito-addons-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>kogito-addons-quarkus-knative-parent</artifactId>
-  <packaging>pom</packaging>
   <name>Kogito Add-On Knative - Parent</name>
+
+  <packaging>pom</packaging>
+
   <description>Parent module for Kogito Quarkus Knative Add-Ons</description>
   <modules>
     <module>eventing</module>
diff --git a/quarkus/addons/knative/serving/deployment/pom.xml b/quarkus/addons/knative/serving/deployment/pom.xml
index 791505e5f66..70b4e7f8c03 100644
--- a/quarkus/addons/knative/serving/deployment/pom.xml
+++ b/quarkus/addons/knative/serving/deployment/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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-knative-serving-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
@@ -38,12 +38,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-knative-serving</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-quarkus-kubernetes-deployment</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-quarkus-kubernetes-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.kie.kogito</groupId>
diff --git a/quarkus/addons/knative/serving/integration-tests/pom.xml b/quarkus/addons/knative/serving/integration-tests/pom.xml
index de2a06f37bd..a1a17dbb31c 100644
--- a/quarkus/addons/knative/serving/integration-tests/pom.xml
+++ b/quarkus/addons/knative/serving/integration-tests/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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-knative-serving-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
@@ -68,15 +68,15 @@
             <artifactId>quarkus-resteasy-jackson</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-knative-serving</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-quarkus-kubernetes</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-quarkus-kubernetes</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog</artifactId>
         </dependency>
         <dependency>
@@ -111,7 +111,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-test-utils</artifactId>
             <scope>test</scope>
         </dependency>
@@ -122,7 +122,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-deployment</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/quarkus/addons/knative/serving/pom.xml b/quarkus/addons/knative/serving/pom.xml
index 3f503b125d9..5f76fe67ba1 100644
--- a/quarkus/addons/knative/serving/pom.xml
+++ b/quarkus/addons/knative/serving/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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-knative-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
diff --git a/quarkus/addons/knative/serving/runtime/pom.xml b/quarkus/addons/knative/serving/runtime/pom.xml
index e8bb991bb64..86e00cd1a2b 100644
--- a/quarkus/addons/knative/serving/runtime/pom.xml
+++ b/quarkus/addons/knative/serving/runtime/pom.xml
@@ -23,7 +23,7 @@
          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>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-knative-serving-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
@@ -39,8 +39,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-quarkus-kubernetes</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-quarkus-kubernetes</artifactId>
         </dependency>
         <dependency>
             <groupId>org.kie.kogito</groupId>
@@ -89,19 +89,19 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-test-utils</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- this is used implicitly by Maven parallel builds so let's make Maven aware of it -->
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-quarkus-kubernetes-deployment</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-quarkus-kubernetes-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>
diff --git a/quarkus/addons/kubernetes/deployment/pom.xml b/quarkus/addons/kubernetes/deployment/pom.xml
index 5c773ce6fae..69073b1a9fa 100644
--- a/quarkus/addons/kubernetes/deployment/pom.xml
+++ b/quarkus/addons/kubernetes/deployment/pom.xml
@@ -23,12 +23,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-kubernetes-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-kubernetes-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-kubernetes-deployment</artifactId>
-  <name>Kogito Add-On Kubernetes - Deployment</name>
+  <artifactId>kie-addons-quarkus-kubernetes-deployment</artifactId>
+  <name>KIE Add-On Kubernetes - Deployment</name>
 
   <properties>
      <java.module.name>org.kie.kogito.addons.quarkus.kubernetes</java.module.name>
@@ -45,12 +45,12 @@
       <artifactId>quarkus-cache-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-kubernetes</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-kubernetes</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -63,7 +63,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/quarkus/addons/kubernetes/deployment/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/KogitoAddOnKubernetesProcessor.java b/quarkus/addons/kubernetes/deployment/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/KogitoAddOnKubernetesProcessor.java
index cc161f115aa..3e4b9b33b68 100644
--- a/quarkus/addons/kubernetes/deployment/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/KogitoAddOnKubernetesProcessor.java
+++ b/quarkus/addons/kubernetes/deployment/src/main/java/org/kie/kogito/addons/quarkus/kubernetes/KogitoAddOnKubernetesProcessor.java
@@ -33,7 +33,7 @@
 
 class KogitoAddOnKubernetesProcessor extends AnyEngineKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-kubernetes-extension";
+    private static final String FEATURE = "kie-addon-kubernetes-extension";
 
     @BuildStep
     FeatureBuildItem feature() {
diff --git a/quarkus/addons/kubernetes/integration-tests/pom.xml b/quarkus/addons/kubernetes/integration-tests/pom.xml
index bc7c7e06ac1..39d62b4e0ae 100644
--- a/quarkus/addons/kubernetes/integration-tests/pom.xml
+++ b/quarkus/addons/kubernetes/integration-tests/pom.xml
@@ -4,13 +4,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-quarkus-kubernetes-parent</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-quarkus-kubernetes-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kogito-addons-quarkus-kubernetes-integration-tests</artifactId>
-    <name>Kogito Add-On Kubernetes - Integration Tests</name>
+    <artifactId>kie-addons-quarkus-kubernetes-integration-tests</artifactId>
+    <name>KIE Add-On Kubernetes - Integration Tests</name>
 
   <properties>
      <java.module.name>org.kie.kogito.addons.quarkus.kubernetes.tests</java.module.name>
@@ -50,11 +50,11 @@
             <artifactId>quarkus-resteasy-jackson</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-quarkus-kubernetes</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-quarkus-kubernetes</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog</artifactId>
         </dependency>
         <dependency>
@@ -78,7 +78,7 @@
             <artifactId>rest-assured</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-test-utils</artifactId>
             <scope>test</scope>
         </dependency>
@@ -89,8 +89,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/quarkus/addons/kubernetes/pom.xml b/quarkus/addons/kubernetes/pom.xml
index e721a4707f1..af741a3122b 100644
--- a/quarkus/addons/kubernetes/pom.xml
+++ b/quarkus/addons/kubernetes/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-kubernetes-parent</artifactId>
-  <name>Kogito Add-On Kubernetes - Parent</name>
+  <artifactId>kie-addons-quarkus-kubernetes-parent</artifactId>
+  <name>KIE Add-On Kubernetes - Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/kubernetes/runtime/pom.xml b/quarkus/addons/kubernetes/runtime/pom.xml
index 19dd5d30f62..34c4530a7ac 100644
--- a/quarkus/addons/kubernetes/runtime/pom.xml
+++ b/quarkus/addons/kubernetes/runtime/pom.xml
@@ -23,13 +23,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-kubernetes-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-kubernetes-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-kubernetes</artifactId>
-  <name>Kogito Add-On Kubernetes</name>
-  <description>Kubernetes Kogito Add-On. Adds support Kubernetes service discovery.</description>
+  <artifactId>kie-addons-quarkus-kubernetes</artifactId>
+  <name>KIE Add-On Kubernetes</name>
+  <description>Kubernetes KIE Add-On. Adds support Kubernetes service discovery.</description>
 
     <properties>
        <java.module.name>org.kie.kogito.addons.quarkus.k8s</java.module.name>
@@ -86,12 +86,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-fabric8-kubernetes-service-catalog</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/quarkus/addons/mail/deployment/pom.xml b/quarkus/addons/mail/deployment/pom.xml
index 716757f720d..11d5003a2fe 100644
--- a/quarkus/addons/mail/deployment/pom.xml
+++ b/quarkus/addons/mail/deployment/pom.xml
@@ -40,7 +40,7 @@
       <artifactId>quarkus-smallrye-reactive-messaging-kafka-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/mail/deployment/src/main/java/org/kie/kogito/mail/deployment/KogitoAddOnMailProcessor.java b/quarkus/addons/mail/deployment/src/main/java/org/kie/kogito/mail/deployment/KogitoAddOnMailProcessor.java
index 24f572ed4fd..ad9bd980748 100644
--- a/quarkus/addons/mail/deployment/src/main/java/org/kie/kogito/mail/deployment/KogitoAddOnMailProcessor.java
+++ b/quarkus/addons/mail/deployment/src/main/java/org/kie/kogito/mail/deployment/KogitoAddOnMailProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnMailProcessor extends RequireCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-mail-extension";
+    private static final String FEATURE = "jbpm-addon-mail-extension";
 
     KogitoAddOnMailProcessor() {
         super(KogitoCapability.PROCESSES);
diff --git a/quarkus/addons/mail/pom.xml b/quarkus/addons/mail/pom.xml
index 284115ab6f4..4d774cbdee0 100644
--- a/quarkus/addons/mail/pom.xml
+++ b/quarkus/addons/mail/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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/quarkus/addons/marshallers/avro/deployment/pom.xml b/quarkus/addons/marshallers/avro/deployment/pom.xml
index c558165f638..0082ced5038 100644
--- a/quarkus/addons/marshallers/avro/deployment/pom.xml
+++ b/quarkus/addons/marshallers/avro/deployment/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-quarkus-marshallers-avro-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-marshallers-avro-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-marshallers-avro-deployment</artifactId>
-  <name>Kogito :: Add-Ons :: Quarkus :: Marshallers :: Avro :: Deployment</name>
-  <description>Kogito Quarkus Marshallers Unmarshaller for Avro deployment</description>
+  <artifactId>kie-addons-quarkus-marshallers-avro-deployment</artifactId>
+  <name>KIE :: Add-Ons :: Quarkus :: Marshallers :: Avro :: Deployment</name>
+  <description>KIE Quarkus Marshallers Unmarshaller for Avro deployment</description>
 
   <properties>
      <java.module.name>org.kie.kogito.addon.avro.quarkus.deployment</java.module.name>
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-marshallers-avro</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-marshallers-avro</artifactId>
     </dependency>
  
      <dependency>
diff --git a/quarkus/addons/marshallers/avro/pom.xml b/quarkus/addons/marshallers/avro/pom.xml
index ea07ff61eb9..dd823dfca1d 100644
--- a/quarkus/addons/marshallers/avro/pom.xml
+++ b/quarkus/addons/marshallers/avro/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-quarkus-marshallers-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-marshallers-avro-parent</artifactId>
+  <artifactId>kie-addons-quarkus-marshallers-avro-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito :: Add-Ons :: Quarkus :: Marshallers :: Avro :: Parent</name>
+  <name>KIE :: Add-Ons :: Quarkus :: Marshallers :: Avro :: Parent</name>
 
-  <description>Kogito Quarkus Avro Marshaller and Unmarshaller</description>
+  <description>KIE Quarkus Avro Marshaller and Unmarshaller</description>
 
   <modules>
     <module>runtime</module>
diff --git a/quarkus/addons/marshallers/avro/runtime/pom.xml b/quarkus/addons/marshallers/avro/runtime/pom.xml
index fa2bf7750f8..b6f1e2c980e 100644
--- a/quarkus/addons/marshallers/avro/runtime/pom.xml
+++ b/quarkus/addons/marshallers/avro/runtime/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-quarkus-marshallers-avro-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-marshallers-avro-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-marshallers-avro</artifactId>
-  <name>Kogito :: Add-Ons :: Quarkus :: Marshallers :: Avro</name>
-  <description>Kogito Quarkus Marshallers Unmarshaller for Avro</description>
+  <artifactId>kie-addons-quarkus-marshallers-avro</artifactId>
+  <name>KIE :: Add-Ons :: Quarkus :: Marshallers :: Avro</name>
+  <description>KIE Quarkus Marshallers Unmarshaller for Avro</description>
 
     <properties>
        <java.module.name>org.kie.kogito.addon.avro.quarkus</java.module.name>
diff --git a/quarkus/addons/marshallers/pom.xml b/quarkus/addons/marshallers/pom.xml
index dd63bbac6f3..e2cd27a773b 100644
--- a/quarkus/addons/marshallers/pom.xml
+++ b/quarkus/addons/marshallers/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-quarkus-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/quarkus/addons/messaging/common/pom.xml b/quarkus/addons/messaging/common/pom.xml
index 7dca00ae430..63780e8d7fb 100644
--- a/quarkus/addons/messaging/common/pom.xml
+++ b/quarkus/addons/messaging/common/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-quarkus-messaging-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-messaging-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-messaging-common</artifactId>
-  <name>Kogito Add-On Messaging - Common</name>
-  <description>Common classes for Kogito messaging Add-On (Quarkus)</description>
+  <artifactId>kie-addons-quarkus-messaging-common</artifactId>
+  <name>KIE Add-On Messaging - Common</name>
+  <description>Common classes for KIE messaging Add-On (Quarkus)</description>
 
   <properties>
      <java.module.name>org.kie.kogito.addon.quarkus.messaging.common</java.module.name>
@@ -41,7 +41,7 @@
       <artifactId>kogito-addons-messaging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-reactive-messaging</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/messaging/deployment/pom.xml b/quarkus/addons/messaging/deployment/pom.xml
index 989f841db5e..dd4e5be5430 100644
--- a/quarkus/addons/messaging/deployment/pom.xml
+++ b/quarkus/addons/messaging/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-messaging-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-messaging-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
-  <name>Kogito Add-On Messaging - Deployment</name>
+  <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
+  <name>KIE Add-On Messaging - Deployment</name>
 
   <properties>
      <java.module.name>org.kie.kogito.addon.cloudevents.quarkus.deployment</java.module.name>
@@ -36,8 +36,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -48,7 +48,7 @@
       <artifactId>kogito-codegen-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/messaging/deployment/src/main/java/org/kie/kogito/addon/cloudevents/quarkus/deployment/KogitoAddOnMessagingProcessor.java b/quarkus/addons/messaging/deployment/src/main/java/org/kie/kogito/addon/cloudevents/quarkus/deployment/KogitoAddOnMessagingProcessor.java
index ef95b1ffd02..b3b942df83b 100644
--- a/quarkus/addons/messaging/deployment/src/main/java/org/kie/kogito/addon/cloudevents/quarkus/deployment/KogitoAddOnMessagingProcessor.java
+++ b/quarkus/addons/messaging/deployment/src/main/java/org/kie/kogito/addon/cloudevents/quarkus/deployment/KogitoAddOnMessagingProcessor.java
@@ -50,7 +50,7 @@
 
 public class KogitoAddOnMessagingProcessor extends AnyEngineKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-messaging-extension";
+    private static final String FEATURE = "kie-addon-messaging-extension";
 
     @BuildStep
     FeatureBuildItem feature() {
diff --git a/quarkus/addons/messaging/integration-tests/pom.xml b/quarkus/addons/messaging/integration-tests/pom.xml
index c23b0396b0d..f507e3e3f8f 100644
--- a/quarkus/addons/messaging/integration-tests/pom.xml
+++ b/quarkus/addons/messaging/integration-tests/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>
-    <artifactId>kogito-addons-quarkus-messaging-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-messaging-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-messaging-it</artifactId>
-  <name>Kogito Add-On Messaging - Integration Tests</name>
+  <artifactId>kie-addons-quarkus-messaging-it</artifactId>
+  <name>KIE Add-On Messaging - Integration Tests</name>
   <description>Integration tests for Messaging Add-On (Quarkus)</description>
 
   <properties>
@@ -49,8 +49,8 @@
       <artifactId>quarkus-resteasy-jackson</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -95,8 +95,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/addons/messaging/pom.xml b/quarkus/addons/messaging/pom.xml
index 87569f72fd0..bb0ca24ccb8 100644
--- a/quarkus/addons/messaging/pom.xml
+++ b/quarkus/addons/messaging/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>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-messaging-parent</artifactId>
+  <artifactId>kie-addons-quarkus-messaging-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito Add-On Messaging - Parent</name>
-  <description>Kogito Quarkus Messaging Parent</description>
+  <name>KIE Add-On Messaging - Parent</name>
+  <description>KIE Quarkus Messaging Parent</description>
 
   <modules>
     <module>common</module>
diff --git a/quarkus/addons/messaging/runtime/pom.xml b/quarkus/addons/messaging/runtime/pom.xml
index 65e1e947eaa..19ebf9b6143 100644
--- a/quarkus/addons/messaging/runtime/pom.xml
+++ b/quarkus/addons/messaging/runtime/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>
-    <artifactId>kogito-addons-quarkus-messaging-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-messaging-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-messaging</artifactId>
-  <name>Kogito Add-On Messaging</name>
-  <description>Kogito Events handling for BPMN messages Add-On (Quarkus)</description>
+  <artifactId>kie-addons-quarkus-messaging</artifactId>
+  <name>KIE Add-On Messaging</name>
+  <description>KIE Events handling for BPMN messages Add-On (Quarkus)</description>
 
   <properties>
      <java.module.name>org.kie.kogito.addon.messaging</java.module.name>
@@ -39,8 +39,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging-common</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging-common</artifactId>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
diff --git a/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml b/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml
index f936cd704a9..8223eba7f36 100644
--- a/quarkus/addons/microprofile-config-service-catalog/deployment/pom.xml
+++ b/quarkus/addons/microprofile-config-service-catalog/deployment/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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-microprofile-config-service-catalog-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
@@ -42,11 +42,11 @@
             <artifactId>quarkus-arc-deployment</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-microprofile-config-service-catalog</artifactId>
         </dependency>
     </dependencies>
diff --git a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml b/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml
index 8e9ff6bed83..06b3a5fcf5f 100644
--- a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml
+++ b/quarkus/addons/microprofile-config-service-catalog/integration-tests/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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-microprofile-config-service-catalog-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
@@ -68,11 +68,11 @@
             <artifactId>quarkus-resteasy-jackson</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-knative-serving</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-microprofile-config-service-catalog</artifactId>
         </dependency>
 
diff --git a/quarkus/addons/microprofile-config-service-catalog/pom.xml b/quarkus/addons/microprofile-config-service-catalog/pom.xml
index 121b690f5af..04a5222464d 100644
--- a/quarkus/addons/microprofile-config-service-catalog/pom.xml
+++ b/quarkus/addons/microprofile-config-service-catalog/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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
diff --git a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml b/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
index 41f92992891..945c1b388d3 100644
--- a/quarkus/addons/microprofile-config-service-catalog/runtime/pom.xml
+++ b/quarkus/addons/microprofile-config-service-catalog/runtime/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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <artifactId>kogito-addons-quarkus-microprofile-config-service-catalog-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
diff --git a/quarkus/addons/monitoring/core/pom.xml b/quarkus/addons/monitoring/core/pom.xml
index 07d61e02ea4..690d50c4ad0 100644
--- a/quarkus/addons/monitoring/core/pom.xml
+++ b/quarkus/addons/monitoring/core/pom.xml
@@ -23,13 +23,13 @@
          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-quarkus-monitoring-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-monitoring-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>kogito-addons-quarkus-monitoring-core</artifactId>
-  <name>Kogito Add-On Monitoring Core</name>
+  <artifactId>kie-addons-quarkus-monitoring-core</artifactId>
+  <name>KIE Add-On Monitoring Core</name>
 
     <properties>
        <java.module.name>org.kie.kogito.monitoring.core.quarkus</java.module.name>
diff --git a/quarkus/addons/monitoring/elastic/deployment/pom.xml b/quarkus/addons/monitoring/elastic/deployment/pom.xml
index 7906a102a81..8a836e7f8fe 100644
--- a/quarkus/addons/monitoring/elastic/deployment/pom.xml
+++ b/quarkus/addons/monitoring/elastic/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-monitoring-elastic-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-monitoring-elastic-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-monitoring-elastic-deployment</artifactId>
-  <name>Kogito Add-On Monitoring Elastic - Deployment</name>
+  <artifactId>kie-addons-quarkus-monitoring-elastic-deployment</artifactId>
+  <name>KIE Add-On Monitoring Elastic - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.monitoring.elastic.quarkus.deployment</java.module.name>
@@ -36,11 +36,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-monitoring-elastic</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-monitoring-elastic</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/monitoring/elastic/deployment/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/deployment/KogitoAddOnMonitoringElasticProcessor.java b/quarkus/addons/monitoring/elastic/deployment/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/deployment/KogitoAddOnMonitoringElasticProcessor.java
index c1cacbdb1b3..a00cd702695 100644
--- a/quarkus/addons/monitoring/elastic/deployment/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/deployment/KogitoAddOnMonitoringElasticProcessor.java
+++ b/quarkus/addons/monitoring/elastic/deployment/src/main/java/org/kie/kogito/monitoring/elastic/quarkus/deployment/KogitoAddOnMonitoringElasticProcessor.java
@@ -25,7 +25,7 @@
 
 class KogitoAddOnMonitoringElasticProcessor extends AnyEngineKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-monitoring-elastic-extension";
+    private static final String FEATURE = "kie-addon-monitoring-elastic-extension";
 
     @BuildStep
     FeatureBuildItem feature() {
diff --git a/quarkus/addons/monitoring/elastic/pom.xml b/quarkus/addons/monitoring/elastic/pom.xml
index a2c583635ba..81aeb949cd9 100644
--- a/quarkus/addons/monitoring/elastic/pom.xml
+++ b/quarkus/addons/monitoring/elastic/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-quarkus-monitoring-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-monitoring-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-monitoring-elastic-parent</artifactId>
+  <artifactId>kie-addons-quarkus-monitoring-elastic-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito Add-On Monitoring Elastic - Parent</name>
-  <description>Kogito Quarkus Monitoring Elastic Parent</description>
+  <name>KIE Add-On Monitoring Elastic - Parent</name>
+  <description>KIE Quarkus Monitoring Elastic Parent</description>
 
   <modules>
     <module>runtime</module>
diff --git a/quarkus/addons/monitoring/elastic/runtime/pom.xml b/quarkus/addons/monitoring/elastic/runtime/pom.xml
index a534557b651..078085a1005 100644
--- a/quarkus/addons/monitoring/elastic/runtime/pom.xml
+++ b/quarkus/addons/monitoring/elastic/runtime/pom.xml
@@ -23,14 +23,14 @@
          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-quarkus-monitoring-elastic-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-monitoring-elastic-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-monitoring-elastic</artifactId>
-  <name>Kogito Add-On Monitoring Elastic</name>
+  <artifactId>kie-addons-quarkus-monitoring-elastic</artifactId>
+  <name>KIE Add-On Monitoring Elastic</name>
   <description>Monitoring Elastic Quarkus</description>
 
     <properties>
@@ -47,8 +47,8 @@
       <artifactId>kogito-addons-monitoring-elastic</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-monitoring-core</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/quarkus/addons/monitoring/pom.xml b/quarkus/addons/monitoring/pom.xml
index ef6d12e7de2..99cd85c7866 100644
--- a/quarkus/addons/monitoring/pom.xml
+++ b/quarkus/addons/monitoring/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-monitoring-parent</artifactId>
-  <name>Kogito Add-On Monitoring - Parent</name>
-  <description>Kogito Monitoring Addons for Quarkus Runtime</description>
+  <artifactId>kie-addons-quarkus-monitoring-parent</artifactId>
+  <name>KIE Add-On Monitoring - Parent</name>
+  <description>KIE Monitoring Addons for Quarkus Runtime</description>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/monitoring/prometheus/deployment/pom.xml b/quarkus/addons/monitoring/prometheus/deployment/pom.xml
index 7b844c8be43..aa6f13872a1 100644
--- a/quarkus/addons/monitoring/prometheus/deployment/pom.xml
+++ b/quarkus/addons/monitoring/prometheus/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-monitoring-prometheus-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-monitoring-prometheus-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-monitoring-prometheus-deployment</artifactId>
-  <name>Kogito Add-On Monitoring Prometheus - Deployment</name>
+  <artifactId>kie-addons-quarkus-monitoring-prometheus-deployment</artifactId>
+  <name>KIE Add-On Monitoring Prometheus - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.monitoring.prometheus.quarkus.deployment</java.module.name>
@@ -36,11 +36,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-monitoring-prometheus</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-monitoring-prometheus</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/monitoring/prometheus/deployment/src/main/java/org/kie/kogito/monitoring/prometheus/quarkus/deployment/KogitoAddOnMonitoringPrometheusProcessor.java b/quarkus/addons/monitoring/prometheus/deployment/src/main/java/org/kie/kogito/monitoring/prometheus/quarkus/deployment/KogitoAddOnMonitoringPrometheusProcessor.java
index 4fec42c3926..568e4bc29ee 100644
--- a/quarkus/addons/monitoring/prometheus/deployment/src/main/java/org/kie/kogito/monitoring/prometheus/quarkus/deployment/KogitoAddOnMonitoringPrometheusProcessor.java
+++ b/quarkus/addons/monitoring/prometheus/deployment/src/main/java/org/kie/kogito/monitoring/prometheus/quarkus/deployment/KogitoAddOnMonitoringPrometheusProcessor.java
@@ -25,7 +25,7 @@
 
 class KogitoAddOnMonitoringPrometheusProcessor extends AnyEngineKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-monitoring-prometheus-extension";
+    private static final String FEATURE = "kie-addon-monitoring-prometheus-extension";
 
     @BuildStep
     FeatureBuildItem feature() {
diff --git a/quarkus/addons/monitoring/prometheus/pom.xml b/quarkus/addons/monitoring/prometheus/pom.xml
index 5394f97c227..a8cb20ecf26 100644
--- a/quarkus/addons/monitoring/prometheus/pom.xml
+++ b/quarkus/addons/monitoring/prometheus/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-quarkus-monitoring-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-monitoring-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-monitoring-prometheus-parent</artifactId>
+  <artifactId>kie-addons-quarkus-monitoring-prometheus-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito Add-On Monitoring Prometheus - Parent</name>
-  <description>Kogito Quarkus Monitoring Prometheus Parent</description>
+  <name>KIE Add-On Monitoring Prometheus - Parent</name>
+  <description>KIE Quarkus Monitoring Prometheus Parent</description>
 
   <modules>
     <module>runtime</module>
diff --git a/quarkus/addons/monitoring/prometheus/runtime/pom.xml b/quarkus/addons/monitoring/prometheus/runtime/pom.xml
index ddb963e987e..14f5c5700ed 100644
--- a/quarkus/addons/monitoring/prometheus/runtime/pom.xml
+++ b/quarkus/addons/monitoring/prometheus/runtime/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-quarkus-monitoring-prometheus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-monitoring-prometheus-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-monitoring-prometheus</artifactId>
-  <name>Kogito Add-On Monitoring Prometheus</name>
+  <artifactId>kie-addons-quarkus-monitoring-prometheus</artifactId>
+  <name>KIE Add-On Monitoring Prometheus</name>
   <description>Prometheus monitoring for Quarkus</description>
 
     <properties>
@@ -56,8 +56,8 @@
       <artifactId>kogito-addons-monitoring-prometheus</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-monitoring-core</artifactId>
     </dependency>
 
     <!-- test dependencies -->
diff --git a/quarkus/addons/persistence/filesystem/deployment/pom.xml b/quarkus/addons/persistence/filesystem/deployment/pom.xml
index cd703d11af2..e374129ff44 100644
--- a/quarkus/addons/persistence/filesystem/deployment/pom.xml
+++ b/quarkus/addons/persistence/filesystem/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-persistence-filesystem-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-filesystem-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-filesystem-deployment</artifactId>
-  <name>Kogito Add-On Persistence FileSystem - Deployment</name>
+  <artifactId>kie-addons-quarkus-persistence-filesystem-deployment</artifactId>
+  <name>KIE Add-On Persistence FileSystem - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.persistence.quarkus.filesystem.deployment</java.module.name>
@@ -37,11 +37,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-filesystem</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-filesystem</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/persistence/filesystem/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/filesystem/deployment/KogitoAddOnPersistenceFileSystemProcessor.java b/quarkus/addons/persistence/filesystem/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/filesystem/deployment/KogitoAddOnPersistenceFileSystemProcessor.java
index f360061bfd9..7ae1659de0d 100644
--- a/quarkus/addons/persistence/filesystem/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/filesystem/deployment/KogitoAddOnPersistenceFileSystemProcessor.java
+++ b/quarkus/addons/persistence/filesystem/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/filesystem/deployment/KogitoAddOnPersistenceFileSystemProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnPersistenceFileSystemProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-persistence-filesystem-extension";
+    private static final String FEATURE = "kie-addon-persistence-filesystem-extension";
 
     KogitoAddOnPersistenceFileSystemProcessor() {
         super(KogitoCapability.PROCESSES, KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/persistence/filesystem/pom.xml b/quarkus/addons/persistence/filesystem/pom.xml
index eff15214e40..e06991e5322 100644
--- a/quarkus/addons/persistence/filesystem/pom.xml
+++ b/quarkus/addons/persistence/filesystem/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-quarkus-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-filesystem-parent</artifactId>
+  <artifactId>kie-addons-quarkus-persistence-filesystem-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito Add-On Persistence FileSystem - Parent</name>
-  <description>Kogito Quarkus Persistence FileSystem Parent</description>
+  <name>KIE Add-On Persistence FileSystem - Parent</name>
+  <description>KIE Quarkus Persistence FileSystem Parent</description>
 
   <modules>
     <module>runtime</module>
diff --git a/quarkus/addons/persistence/filesystem/runtime/pom.xml b/quarkus/addons/persistence/filesystem/runtime/pom.xml
index 15a309d4fbc..b05c7a6123b 100644
--- a/quarkus/addons/persistence/filesystem/runtime/pom.xml
+++ b/quarkus/addons/persistence/filesystem/runtime/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-quarkus-persistence-filesystem-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-persistence-filesystem-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-persistence-filesystem</artifactId>
-  <name>Kogito Add-On Persistence FileSystem</name>
+  <artifactId>kie-addons-quarkus-persistence-filesystem</artifactId>
+  <name>KIE Add-On Persistence FileSystem</name>
 
   <description>FileSystem Persistence support for Quarkus</description>
 
diff --git a/quarkus/addons/persistence/infinispan/deployment/pom.xml b/quarkus/addons/persistence/infinispan/deployment/pom.xml
index 3d3bf9af5af..ad1fbea5a10 100644
--- a/quarkus/addons/persistence/infinispan/deployment/pom.xml
+++ b/quarkus/addons/persistence/infinispan/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-persistence-infinispan-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-infinispan-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-infinispan-deployment</artifactId>
-  <name>Kogito Add-On Persistence Infinispan - Deployment</name>
+  <artifactId>kie-addons-quarkus-persistence-infinispan-deployment</artifactId>
+  <name>KIE Add-On Persistence Infinispan - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.persistence.quarkus.infinispan.deployment</java.module.name>
@@ -37,11 +37,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-infinispan</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-infinispan</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/persistence/infinispan/deployment/src/main/java/org/kie/kogito/infinispan/quarkus/deployment/KogitoAddOnPersistenceInfinispanProcessor.java b/quarkus/addons/persistence/infinispan/deployment/src/main/java/org/kie/kogito/infinispan/quarkus/deployment/KogitoAddOnPersistenceInfinispanProcessor.java
index ec1e07f5354..2191312379c 100644
--- a/quarkus/addons/persistence/infinispan/deployment/src/main/java/org/kie/kogito/infinispan/quarkus/deployment/KogitoAddOnPersistenceInfinispanProcessor.java
+++ b/quarkus/addons/persistence/infinispan/deployment/src/main/java/org/kie/kogito/infinispan/quarkus/deployment/KogitoAddOnPersistenceInfinispanProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnPersistenceInfinispanProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-persistence-infinispan-extension";
+    private static final String FEATURE = "kie-addon-persistence-infinispan-extension";
 
     KogitoAddOnPersistenceInfinispanProcessor() {
         super(KogitoCapability.PROCESSES, KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/persistence/infinispan/health/pom.xml b/quarkus/addons/persistence/infinispan/health/pom.xml
index b03681fce2f..db11ffecdef 100644
--- a/quarkus/addons/persistence/infinispan/health/pom.xml
+++ b/quarkus/addons/persistence/infinispan/health/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-quarkus-persistence-infinispan-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-persistence-infinispan-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-persistence-infinispan-health</artifactId>
-  <name>Kogito Add-On Persistence Infinispan Health Check</name>
+  <artifactId>kie-addons-quarkus-persistence-infinispan-health</artifactId>
+  <name>KIE Add-On Persistence Infinispan Health Check</name>
 
   <description>Infinispan Health Check support for Quarkus</description>
 
diff --git a/quarkus/addons/persistence/infinispan/pom.xml b/quarkus/addons/persistence/infinispan/pom.xml
index 14773c47f41..b5fec70b574 100644
--- a/quarkus/addons/persistence/infinispan/pom.xml
+++ b/quarkus/addons/persistence/infinispan/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-quarkus-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-infinispan-parent</artifactId>
+  <artifactId>kie-addons-quarkus-persistence-infinispan-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito Add-On Persistence Infinispan - Parent</name>
-  <description>Kogito Quarkus Persistence Infinispan Parent</description>
+  <name>KIE Add-On Persistence Infinispan - Parent</name>
+  <description>KIE Quarkus Persistence Infinispan Parent</description>
 
   <modules>
     <module>runtime</module>
diff --git a/quarkus/addons/persistence/infinispan/runtime/pom.xml b/quarkus/addons/persistence/infinispan/runtime/pom.xml
index e03ebdc8fa8..c41d8832f58 100644
--- a/quarkus/addons/persistence/infinispan/runtime/pom.xml
+++ b/quarkus/addons/persistence/infinispan/runtime/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-quarkus-persistence-infinispan-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-persistence-infinispan-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-persistence-infinispan</artifactId>
-  <name>Kogito Add-On Persistence Infinispan</name>
+  <artifactId>kie-addons-quarkus-persistence-infinispan</artifactId>
+  <name>KIE Add-On Persistence Infinispan</name>
 
   <description>Infinispan Persistence support for Quarkus</description>
 
diff --git a/quarkus/addons/persistence/jdbc/deployment/pom.xml b/quarkus/addons/persistence/jdbc/deployment/pom.xml
index 9606fa1c58a..53344acf127 100644
--- a/quarkus/addons/persistence/jdbc/deployment/pom.xml
+++ b/quarkus/addons/persistence/jdbc/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-persistence-jdbc-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-jdbc-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-jdbc-deployment</artifactId>
-  <name>Kogito Add-On Persistence JDBC - Deployment</name>
+  <artifactId>kie-addons-quarkus-persistence-jdbc-deployment</artifactId>
+  <name>KIE Add-On Persistence JDBC - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.persistence.quarkus.jdbc.deployment</java.module.name>
@@ -36,11 +36,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-jdbc</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-jdbc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/persistence/jdbc/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/jdbc/deployment/KogitoAddOnPersistenceJDBCProcessor.java b/quarkus/addons/persistence/jdbc/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/jdbc/deployment/KogitoAddOnPersistenceJDBCProcessor.java
index d02f8d05986..2195c401c4b 100644
--- a/quarkus/addons/persistence/jdbc/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/jdbc/deployment/KogitoAddOnPersistenceJDBCProcessor.java
+++ b/quarkus/addons/persistence/jdbc/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/jdbc/deployment/KogitoAddOnPersistenceJDBCProcessor.java
@@ -29,7 +29,7 @@
 
 class KogitoAddOnPersistenceJDBCProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-persistence-jdbc-extension";
+    private static final String FEATURE = "kie-addon-persistence-jdbc-extension";
 
     KogitoAddOnPersistenceJDBCProcessor() {
         super(KogitoCapability.PROCESSES, KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/persistence/jdbc/pom.xml b/quarkus/addons/persistence/jdbc/pom.xml
index 7b6077f6502..5872d577e95 100644
--- a/quarkus/addons/persistence/jdbc/pom.xml
+++ b/quarkus/addons/persistence/jdbc/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-quarkus-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-jdbc-parent</artifactId>
+  <artifactId>kie-addons-quarkus-persistence-jdbc-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito Add-On Persistence JDBC - Parent</name>
-  <description>Kogito Quarkus Persistence JDBC Parent</description>
+  <name>KIE Add-On Persistence JDBC - Parent</name>
+  <description>KIE Quarkus Persistence JDBC Parent</description>
 
   <modules>
     <module>runtime</module>
diff --git a/quarkus/addons/persistence/jdbc/runtime/pom.xml b/quarkus/addons/persistence/jdbc/runtime/pom.xml
index 7ca46cd9cc4..7414189ee1b 100644
--- a/quarkus/addons/persistence/jdbc/runtime/pom.xml
+++ b/quarkus/addons/persistence/jdbc/runtime/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-quarkus-persistence-jdbc-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-persistence-jdbc-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-persistence-jdbc</artifactId>
-  <name>Kogito Add-On Persistence JDBC</name>
+  <artifactId>kie-addons-quarkus-persistence-jdbc</artifactId>
+  <name>KIE Add-On Persistence JDBC</name>
 
   <description>JDBC Persistence support for Quarkus</description>
 
diff --git a/quarkus/addons/persistence/kafka/deployment/pom.xml b/quarkus/addons/persistence/kafka/deployment/pom.xml
index 704fd2340b8..c44302c3766 100644
--- a/quarkus/addons/persistence/kafka/deployment/pom.xml
+++ b/quarkus/addons/persistence/kafka/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-persistence-kafka-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-kafka-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-kafka-deployment</artifactId>
-  <name>Kogito Add-On Persistence Kafka Streams - Deployment</name>
+  <artifactId>kie-addons-quarkus-persistence-kafka-deployment</artifactId>
+  <name>KIE Add-On Persistence Kafka Streams - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.persistence.quarkus.kafka.deployment</java.module.name>
@@ -36,11 +36,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-kafka</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-kafka</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/persistence/kafka/deployment/src/main/java/org/kie/kogito/persistence/kafka/quarkus/deployment/KogitoAddOnPersistenceKafkaProcessor.java b/quarkus/addons/persistence/kafka/deployment/src/main/java/org/kie/kogito/persistence/kafka/quarkus/deployment/KogitoAddOnPersistenceKafkaProcessor.java
index f11a7f80250..ddad165eb84 100644
--- a/quarkus/addons/persistence/kafka/deployment/src/main/java/org/kie/kogito/persistence/kafka/quarkus/deployment/KogitoAddOnPersistenceKafkaProcessor.java
+++ b/quarkus/addons/persistence/kafka/deployment/src/main/java/org/kie/kogito/persistence/kafka/quarkus/deployment/KogitoAddOnPersistenceKafkaProcessor.java
@@ -28,7 +28,7 @@
 
 class KogitoAddOnPersistenceKafkaProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-persistence-kafka-extension";
+    private static final String FEATURE = "kie-addon-persistence-kafka-extension";
     private static final String QUARKUS_KAFKA_STREAMS_TOPICS_PROP = "quarkus.kafka-streams.topics";
 
     KogitoAddOnPersistenceKafkaProcessor() {
diff --git a/quarkus/addons/persistence/kafka/pom.xml b/quarkus/addons/persistence/kafka/pom.xml
index b7cb1ddfb45..d3d9677194c 100644
--- a/quarkus/addons/persistence/kafka/pom.xml
+++ b/quarkus/addons/persistence/kafka/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-quarkus-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-kafka-parent</artifactId>
+  <artifactId>kie-addons-quarkus-persistence-kafka-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito Add-On Persistence Kafka Streams - Parent</name>
-  <description>Kogito Quarkus Persistence Kafka Parent</description>
+  <name>KIE Add-On Persistence Kafka Streams - Parent</name>
+  <description>KIE Quarkus Persistence Kafka Parent</description>
 
   <modules>
     <module>runtime</module>
diff --git a/quarkus/addons/persistence/kafka/runtime/pom.xml b/quarkus/addons/persistence/kafka/runtime/pom.xml
index 8ca7ab431b1..00764b04132 100644
--- a/quarkus/addons/persistence/kafka/runtime/pom.xml
+++ b/quarkus/addons/persistence/kafka/runtime/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>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-persistence-kafka-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-kafka-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-persistence-kafka</artifactId>
-  <name>Kogito Add-On Persistence Kafka Streams</name>
-  <description>Kafka Streams based persistence for Kogito</description>
+  <artifactId>kie-addons-quarkus-persistence-kafka</artifactId>
+  <name>KIE Add-On Persistence Kafka Streams</name>
+  <description>Kafka Streams based persistence for KIE</description>
 
     <properties>
        <java.module.name>org.kie.kogito.persistence.quarkus.kafka</java.module.name>
diff --git a/quarkus/addons/persistence/mongodb/deployment/pom.xml b/quarkus/addons/persistence/mongodb/deployment/pom.xml
index ffd9c65d6ca..430bd650795 100644
--- a/quarkus/addons/persistence/mongodb/deployment/pom.xml
+++ b/quarkus/addons/persistence/mongodb/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-persistence-mongodb-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-mongodb-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-mongodb-deployment</artifactId>
-  <name>Kogito Add-On Persistence MongoDB - Deployment</name>
+  <artifactId>kie-addons-quarkus-persistence-mongodb-deployment</artifactId>
+  <name>KIE Add-On Persistence MongoDB - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.persistence.quarkus.mongodb.deployment</java.module.name>
@@ -36,11 +36,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-mongodb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-mongodb</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/persistence/mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/mongodb/deployment/KogitoAddOnPersistenceMongoDBProcessor.java b/quarkus/addons/persistence/mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/mongodb/deployment/KogitoAddOnPersistenceMongoDBProcessor.java
index a244841e97c..1a39c1214ef 100644
--- a/quarkus/addons/persistence/mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/mongodb/deployment/KogitoAddOnPersistenceMongoDBProcessor.java
+++ b/quarkus/addons/persistence/mongodb/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/mongodb/deployment/KogitoAddOnPersistenceMongoDBProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnPersistenceMongoDBProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-persistence-mongodb-extension";
+    private static final String FEATURE = "kie-addon-persistence-mongodb-extension";
 
     KogitoAddOnPersistenceMongoDBProcessor() {
         super(KogitoCapability.PROCESSES, KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/persistence/mongodb/pom.xml b/quarkus/addons/persistence/mongodb/pom.xml
index e201098b280..077a6ef8c47 100644
--- a/quarkus/addons/persistence/mongodb/pom.xml
+++ b/quarkus/addons/persistence/mongodb/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-quarkus-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-mongodb-parent</artifactId>
+  <artifactId>kie-addons-quarkus-persistence-mongodb-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito Add-On Persistence MongoDB - Parent</name>
-  <description>Kogito Quarkus Persistence MongoDB Parent</description>
+  <name>KIE Add-On Persistence MongoDB - Parent</name>
+  <description>KIE Quarkus Persistence MongoDB Parent</description>
 
   <modules>
     <module>runtime</module>
diff --git a/quarkus/addons/persistence/mongodb/runtime/pom.xml b/quarkus/addons/persistence/mongodb/runtime/pom.xml
index 84787ca9da3..2183dd7280b 100644
--- a/quarkus/addons/persistence/mongodb/runtime/pom.xml
+++ b/quarkus/addons/persistence/mongodb/runtime/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-quarkus-persistence-mongodb-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-persistence-mongodb-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-persistence-mongodb</artifactId>
-  <name>Kogito Add-On Persistence MongoDB</name>
+  <artifactId>kie-addons-quarkus-persistence-mongodb</artifactId>
+  <name>KIE Add-On Persistence MongoDB</name>
 
   <description>MongoDB Persistence support for Quarkus</description>
 
diff --git a/quarkus/addons/persistence/pom.xml b/quarkus/addons/persistence/pom.xml
index 4a643345499..0c66b88b7ac 100644
--- a/quarkus/addons/persistence/pom.xml
+++ b/quarkus/addons/persistence/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-persistence-parent</artifactId>
-  <name>Kogito Add-On Quarkus Persistence</name>
-  <description>Kogito Persistence Addons for Quarkus Runtime</description>
+  <artifactId>kie-addons-quarkus-persistence-parent</artifactId>
+  <name>KIE Add-On Quarkus Persistence</name>
+  <description>KIE Persistence Addons for Quarkus Runtime</description>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/persistence/postgresql/deployment/pom.xml b/quarkus/addons/persistence/postgresql/deployment/pom.xml
index 2041c1d3edc..2b668718c1d 100644
--- a/quarkus/addons/persistence/postgresql/deployment/pom.xml
+++ b/quarkus/addons/persistence/postgresql/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-persistence-postgresql-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-postgresql-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-postgresql-deployment</artifactId>
-  <name>Kogito Add-On Persistence PostgreSQL - Deployment</name>
+  <artifactId>kie-addons-quarkus-persistence-postgresql-deployment</artifactId>
+  <name>KIE Add-On Persistence PostgreSQL - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.persistence.quarkus.postgresql.deployment</java.module.name>
@@ -36,11 +36,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-postgresql</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-postgresql</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/persistence/postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/postgresql/deployment/KogitoAddOnPersistencePostgreSQLProcessor.java b/quarkus/addons/persistence/postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/postgresql/deployment/KogitoAddOnPersistencePostgreSQLProcessor.java
index d29b3727b46..d40e920a82f 100644
--- a/quarkus/addons/persistence/postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/postgresql/deployment/KogitoAddOnPersistencePostgreSQLProcessor.java
+++ b/quarkus/addons/persistence/postgresql/deployment/src/main/java/org/kie/kogito/addons/quarkus/persistence/postgresql/deployment/KogitoAddOnPersistencePostgreSQLProcessor.java
@@ -29,7 +29,7 @@
 
 class KogitoAddOnPersistencePostgreSQLProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-persistence-postgresql-extension";
+    private static final String FEATURE = "kie-addon-persistence-postgresql-extension";
 
     KogitoAddOnPersistencePostgreSQLProcessor() {
         super(KogitoCapability.PROCESSES, KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/persistence/postgresql/pom.xml b/quarkus/addons/persistence/postgresql/pom.xml
index 62ab3aaf3e1..5fbce5f4941 100644
--- a/quarkus/addons/persistence/postgresql/pom.xml
+++ b/quarkus/addons/persistence/postgresql/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-quarkus-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-postgresql-parent</artifactId>
+  <artifactId>kie-addons-quarkus-persistence-postgresql-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito Add-On Persistence PostgreSQL - Parent</name>
-  <description>Kogito Quarkus Persistence PostgreSQL Parent</description>
+  <name>KIE Add-On Persistence PostgreSQL - Parent</name>
+  <description>KIE Quarkus Persistence PostgreSQL Parent</description>
 
   <modules>
     <module>runtime</module>
diff --git a/quarkus/addons/persistence/postgresql/runtime/pom.xml b/quarkus/addons/persistence/postgresql/runtime/pom.xml
index fd135a52061..b102aa649f0 100644
--- a/quarkus/addons/persistence/postgresql/runtime/pom.xml
+++ b/quarkus/addons/persistence/postgresql/runtime/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-quarkus-persistence-postgresql-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-persistence-postgresql-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-persistence-postgresql</artifactId>
-  <name>Kogito Add-On Persistence PostgreSQL</name>
+  <artifactId>kie-addons-quarkus-persistence-postgresql</artifactId>
+  <name>KIE Add-On Persistence PostgreSQL</name>
 
   <description>PostgreSQL Persistence support for Quarkus</description>
 
diff --git a/quarkus/addons/persistence/rocksdb/deployment/pom.xml b/quarkus/addons/persistence/rocksdb/deployment/pom.xml
index 69174556ced..5ff134eae21 100644
--- a/quarkus/addons/persistence/rocksdb/deployment/pom.xml
+++ b/quarkus/addons/persistence/rocksdb/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-persistence-rocksdb-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-rocksdb-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-rocksdb-deployment</artifactId>
-  <name>Kogito Add-On Persistence Rocksdb - Deployment</name>
+  <artifactId>kie-addons-quarkus-persistence-rocksdb-deployment</artifactId>
+  <name>KIE Add-On Persistence Rocksdb - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.persistence.quarkus.rocksdb.deployment</java.module.name>
@@ -36,15 +36,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-rocksdb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-rocksdb</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-arc-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
   </dependencies>
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 5a42e26c5fb..cd685a4be68 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
@@ -27,7 +27,7 @@
 
 class KogitoAddOnPersistenceRocksDBProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-persistence-rocksdb-extension";
+    private static final String FEATURE = "kie-addon-persistence-rocksdb-extension";
 
     KogitoAddOnPersistenceRocksDBProcessor() {
         super(KogitoCapability.PROCESSES, KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/persistence/rocksdb/pom.xml b/quarkus/addons/persistence/rocksdb/pom.xml
index 67c2762af9f..03dc05a34ab 100644
--- a/quarkus/addons/persistence/rocksdb/pom.xml
+++ b/quarkus/addons/persistence/rocksdb/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-quarkus-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-persistence-rocksdb-parent</artifactId>
+  <artifactId>kie-addons-quarkus-persistence-rocksdb-parent</artifactId>
   <packaging>pom</packaging>
-  <name>Kogito Add-On Persistence Rocksdb - Parent</name>
-  <description>Kogito Quarkus Persistence Rocsdb Parent</description>
+  <name>KIE Add-On Persistence Rocksdb - Parent</name>
+  <description>KIE Quarkus Persistence Rocsdb Parent</description>
 
   <modules>
     <module>runtime</module>
diff --git a/quarkus/addons/persistence/rocksdb/runtime/pom.xml b/quarkus/addons/persistence/rocksdb/runtime/pom.xml
index 635d80f9498..f287eb264a0 100644
--- a/quarkus/addons/persistence/rocksdb/runtime/pom.xml
+++ b/quarkus/addons/persistence/rocksdb/runtime/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-quarkus-persistence-rocksdb-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-persistence-rocksdb-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-persistence-rocksdb</artifactId>
-  <name>Kogito Quarkus Add-On Persistence Rocksdb</name>
+  <artifactId>kie-addons-quarkus-persistence-rocksdb</artifactId>
+  <name>KIE Quarkus Add-On Persistence Rocksdb</name>
 
   <description>Rocksdb Persistence support for Quarkus</description>
 
diff --git a/quarkus/addons/pom.xml b/quarkus/addons/pom.xml
index 99a53bfdf0e..d579b4aa5eb 100644
--- a/quarkus/addons/pom.xml
+++ b/quarkus/addons/pom.xml
@@ -30,6 +30,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
+  <groupId>org.kie</groupId>
   <artifactId>kogito-addons-quarkus-parent</artifactId>
   <name>Kogito :: Add-Ons :: Quarkus</name>
   <description>Parent Module for Kogito Quarkus Add-Ons. All add-ons are Quarkus Extensions.</description>
diff --git a/quarkus/addons/process-definitions/deployment/pom.xml b/quarkus/addons/process-definitions/deployment/pom.xml
index 1a55b860ed2..84afb941b5f 100644
--- a/quarkus/addons/process-definitions/deployment/pom.xml
+++ b/quarkus/addons/process-definitions/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-process-definitions-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-process-definitions-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-process-definitions-deployment</artifactId>
-  <name>Kogito Add-On Process Definitions - Deployment</name>
+  <artifactId>kie-addons-quarkus-process-definitions-deployment</artifactId>
+  <name>KIE Add-On Process Definitions - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.process.quarkus.definitions.deployment</java.module.name>
@@ -36,11 +36,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-definitions</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-definitions</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/process-definitions/deployment/src/main/java/org/kie/kogito/process/management/deployment/ProcessDefinitionsProcessor.java b/quarkus/addons/process-definitions/deployment/src/main/java/org/kie/kogito/process/management/deployment/ProcessDefinitionsProcessor.java
index f83a5b42ff1..4050d365855 100644
--- a/quarkus/addons/process-definitions/deployment/src/main/java/org/kie/kogito/process/management/deployment/ProcessDefinitionsProcessor.java
+++ b/quarkus/addons/process-definitions/deployment/src/main/java/org/kie/kogito/process/management/deployment/ProcessDefinitionsProcessor.java
@@ -26,7 +26,7 @@
 
 class ProcessDefinitionsProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-process-definitions-extension";
+    private static final String FEATURE = "kie-addon-process-definitions-extension";
 
     ProcessDefinitionsProcessor() {
         super(KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/process-definitions/pom.xml b/quarkus/addons/process-definitions/pom.xml
index 59e6cea628d..829bf9aff4c 100644
--- a/quarkus/addons/process-definitions/pom.xml
+++ b/quarkus/addons/process-definitions/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-process-definitions-parent</artifactId>
-  <name>Kogito Add-On Process Deployment - Parent</name>
+  <artifactId>kie-addons-quarkus-process-definitions-parent</artifactId>
+  <name>KIE Add-On Process Deployment - Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/process-definitions/runtime/pom.xml b/quarkus/addons/process-definitions/runtime/pom.xml
index 6e2d9cd1af7..7892703712c 100644
--- a/quarkus/addons/process-definitions/runtime/pom.xml
+++ b/quarkus/addons/process-definitions/runtime/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>
-    <artifactId>kogito-addons-quarkus-process-definitions-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-process-definitions-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-process-definitions</artifactId>
-  <name>Kogito Add-On Process Definitions</name>
+  <artifactId>kie-addons-quarkus-process-definitions</artifactId>
+  <name>KIE Add-On Process Definitions</name>
   <description>Allow deploying process definitions for Quarkus</description>
 
     <properties>
@@ -60,8 +60,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-rocksdb-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-rocksdb-deployment</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/process-management/deployment/pom.xml b/quarkus/addons/process-management/deployment/pom.xml
index 5bf7e03a385..3436457142c 100644
--- a/quarkus/addons/process-management/deployment/pom.xml
+++ b/quarkus/addons/process-management/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-process-management-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-process-management-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
-  <name>Kogito Add-On Process Management - Deployment</name>
+  <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
+  <name>KIE Add-On Process Management - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.process.quarkus.management.deployment</java.module.name>
@@ -36,11 +36,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/process-management/deployment/src/main/java/org/kie/kogito/process/management/deployment/KogitoAddOnProcessManagementProcessor.java b/quarkus/addons/process-management/deployment/src/main/java/org/kie/kogito/process/management/deployment/KogitoAddOnProcessManagementProcessor.java
index 2e3538494c6..e27e6a7c4ef 100644
--- a/quarkus/addons/process-management/deployment/src/main/java/org/kie/kogito/process/management/deployment/KogitoAddOnProcessManagementProcessor.java
+++ b/quarkus/addons/process-management/deployment/src/main/java/org/kie/kogito/process/management/deployment/KogitoAddOnProcessManagementProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnProcessManagementProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-process-management-extension";
+    private static final String FEATURE = "kie-addon-process-management-extension";
 
     KogitoAddOnProcessManagementProcessor() {
         super(KogitoCapability.PROCESSES, KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/process-management/integration-tests/pom.xml b/quarkus/addons/process-management/integration-tests/pom.xml
index 6c43331a608..eb37fd86c52 100644
--- a/quarkus/addons/process-management/integration-tests/pom.xml
+++ b/quarkus/addons/process-management/integration-tests/pom.xml
@@ -21,12 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-process-management-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-process-management-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-process-management-integration-tests</artifactId>
-  <name>Kogito:: Addons :: Quarkus:: Process Management :: Integration Test</name>
+  <artifactId>kie-addons-quarkus-process-management-integration-tests</artifactId>
+  <name>KIE:: Addons :: Quarkus:: Process Management :: Integration Test</name>
   <description>Process Management addon testing Testing</description>
 
     <properties>
@@ -55,8 +55,8 @@
       <artifactId>kogito-quarkus-serverless-workflow</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/process-management/pom.xml b/quarkus/addons/process-management/pom.xml
index 45bb342a530..3e52e0abadd 100644
--- a/quarkus/addons/process-management/pom.xml
+++ b/quarkus/addons/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-process-management-parent</artifactId>
-  <name>Kogito Add-On Process Management - Parent</name>
+  <artifactId>kie-addons-quarkus-process-management-parent</artifactId>
+  <name>KIE Add-On Process Management - Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/process-management/runtime/pom.xml b/quarkus/addons/process-management/runtime/pom.xml
index 5c1fe694289..5aef5830c32 100644
--- a/quarkus/addons/process-management/runtime/pom.xml
+++ b/quarkus/addons/process-management/runtime/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>
-    <artifactId>kogito-addons-quarkus-process-management-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-process-management-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-process-management</artifactId>
-  <name>Kogito Add-On Process Management</name>
+  <artifactId>kie-addons-quarkus-process-management</artifactId>
+  <name>KIE Add-On Process Management</name>
   <description>Management of process instances for Quarkus</description>
 
     <properties>
@@ -49,8 +49,8 @@
       <artifactId>kogito-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-rest-exception-handler</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-rest-exception-handler</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
diff --git a/quarkus/addons/process-svg/deployment/pom.xml b/quarkus/addons/process-svg/deployment/pom.xml
index ddabdde28d6..05da92f10b3 100644
--- a/quarkus/addons/process-svg/deployment/pom.xml
+++ b/quarkus/addons/process-svg/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-process-svg-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-process-svg-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-process-svg-deployment</artifactId>
-  <name>Kogito Add-On Process SVG - Deployment</name>
+  <artifactId>kie-addons-quarkus-process-svg-deployment</artifactId>
+  <name>KIE Add-On Process SVG - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.process.quarkus.svg.deployment</java.module.name>
@@ -36,11 +36,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-svg</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-svg</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/process-svg/deployment/src/main/java/org/kie/kogito/svg/deployment/KogitoAddOnProcessSVGProcessor.java b/quarkus/addons/process-svg/deployment/src/main/java/org/kie/kogito/svg/deployment/KogitoAddOnProcessSVGProcessor.java
index 8535e112b86..c2666dc6e59 100644
--- a/quarkus/addons/process-svg/deployment/src/main/java/org/kie/kogito/svg/deployment/KogitoAddOnProcessSVGProcessor.java
+++ b/quarkus/addons/process-svg/deployment/src/main/java/org/kie/kogito/svg/deployment/KogitoAddOnProcessSVGProcessor.java
@@ -29,7 +29,7 @@
 
 class KogitoAddOnProcessSVGProcessor {
 
-    private static final String FEATURE = "kogito-addon-process-svg-extension";
+    private static final String FEATURE = "kie-addon-process-svg-extension";
 
     @BuildStep
     FeatureBuildItem feature() {
diff --git a/quarkus/addons/process-svg/pom.xml b/quarkus/addons/process-svg/pom.xml
index 381b1a70023..ad226f2b9e3 100644
--- a/quarkus/addons/process-svg/pom.xml
+++ b/quarkus/addons/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-process-svg-parent</artifactId>
-  <name>Kogito Add-On Process SVG - Parent</name>
+  <artifactId>kie-addons-quarkus-process-svg-parent</artifactId>
+  <name>KIE Add-On Process SVG - Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/process-svg/runtime/pom.xml b/quarkus/addons/process-svg/runtime/pom.xml
index c36c769b77d..09976dbbba2 100644
--- a/quarkus/addons/process-svg/runtime/pom.xml
+++ b/quarkus/addons/process-svg/runtime/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>
-    <artifactId>kogito-addons-quarkus-process-svg-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-process-svg-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-process-svg</artifactId>
-  <name>Kogito Add-On Process SVG</name>
+  <artifactId>kie-addons-quarkus-process-svg</artifactId>
+  <name>KIE Add-On Process SVG</name>
 
   <description>Quarkus Addon to interact with Process SVG Service</description>
 
diff --git a/quarkus/addons/python/deployment/pom.xml b/quarkus/addons/python/deployment/pom.xml
index 63309b45272..8d2dd1b6b46 100644
--- a/quarkus/addons/python/deployment/pom.xml
+++ b/quarkus/addons/python/deployment/pom.xml
@@ -40,7 +40,7 @@
     <artifactId>kogito-addons-quarkus-serverless-workflow-python</artifactId>
   </dependency>
   <dependency>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
   </dependency>
   <dependency>
diff --git a/quarkus/addons/python/pom.xml b/quarkus/addons/python/pom.xml
index 973916b8e25..6aa2513bd24 100644
--- a/quarkus/addons/python/pom.xml
+++ b/quarkus/addons/python/pom.xml
@@ -21,10 +21,11 @@
 <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>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
+  <groupId>org.kie.kogito</groupId>
   <artifactId>kogito-addons-quarkus-serverless-workflow-python-parent</artifactId>
   <name>Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Parent</name>
   <description>Serverless Workflow Python Quarkus Addons</description>
diff --git a/quarkus/addons/rest-exception-handler/pom.xml b/quarkus/addons/rest-exception-handler/pom.xml
index c3f6f577479..b33ca078c92 100644
--- a/quarkus/addons/rest-exception-handler/pom.xml
+++ b/quarkus/addons/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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-quarkus-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-rest-exception-handler</artifactId>
-  <name>Kogito :: Rest Exception Handler :: Quarkus</name>
-  <description>Kogito exception handling for Quarkus</description>
+  <artifactId>kie-addons-quarkus-rest-exception-handler</artifactId>
+  <name>KIE :: Rest Exception Handler :: Quarkus</name>
+  <description>KIE exception handling for Quarkus</description>
 
     <properties>
        <java.module.name>org.kie.kogito.process.quarkus.rest.exception.handler</java.module.name>
diff --git a/quarkus/addons/source-files/deployment/pom.xml b/quarkus/addons/source-files/deployment/pom.xml
index 82c6d553e04..f0e82f8cf8f 100644
--- a/quarkus/addons/source-files/deployment/pom.xml
+++ b/quarkus/addons/source-files/deployment/pom.xml
@@ -24,12 +24,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>
-        <artifactId>kogito-addons-quarkus-source-files-parent</artifactId>
-        <groupId>org.kie.kogito</groupId>
+        <artifactId>kie-addons-quarkus-source-files-parent</artifactId>
+        <groupId>org.kie</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
-    <artifactId>kogito-addons-quarkus-source-files-deployment</artifactId>
-    <name>Kogito Add-On Source Files - Deployment</name>
+    <artifactId>kie-addons-quarkus-source-files-deployment</artifactId>
+    <name>KIE Add-On Source Files - Deployment</name>
 
     <properties>
        <java.module.name>org.kie.kogito.quarkus.addon.source.files.deployment</java.module.name>
@@ -37,11 +37,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-quarkus-source-files</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-quarkus-source-files</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
+            <groupId>org.kie</groupId>
             <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
         </dependency>
         <dependency>
diff --git a/quarkus/addons/source-files/deployment/src/main/java/org/kie/kogito/addon/source/files/deployment/KogitoAddOnSourceFilesProcessor.java b/quarkus/addons/source-files/deployment/src/main/java/org/kie/kogito/addon/source/files/deployment/KogitoAddOnSourceFilesProcessor.java
index 5862e2924bd..e3641df6ae1 100644
--- a/quarkus/addons/source-files/deployment/src/main/java/org/kie/kogito/addon/source/files/deployment/KogitoAddOnSourceFilesProcessor.java
+++ b/quarkus/addons/source-files/deployment/src/main/java/org/kie/kogito/addon/source/files/deployment/KogitoAddOnSourceFilesProcessor.java
@@ -43,7 +43,7 @@
 
 class KogitoAddOnSourceFilesProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-source-files-extension";
+    private static final String FEATURE = "kie-addon-source-files-extension";
 
     KogitoAddOnSourceFilesProcessor() {
         super(KogitoCapability.PROCESSES, KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/source-files/pom.xml b/quarkus/addons/source-files/pom.xml
index 3191674b376..360876c69d9 100644
--- a/quarkus/addons/source-files/pom.xml
+++ b/quarkus/addons/source-files/pom.xml
@@ -29,12 +29,12 @@
     </modules>
     <parent>
         <artifactId>kogito-addons-quarkus-parent</artifactId>
-        <groupId>org.kie.kogito</groupId>
+        <groupId>org.kie</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
-    <artifactId>kogito-addons-quarkus-source-files-parent</artifactId>
+    <artifactId>kie-addons-quarkus-source-files-parent</artifactId>
     <packaging>pom</packaging>
-    <name>Kogito Add-On Source Files - Parent</name>
-    <description>Kogito Quarkus Source Files Parent</description>
+    <name>KIE Add-On Source Files - Parent</name>
+    <description>KIE Quarkus Source Files Parent</description>
 
 </project>
\ No newline at end of file
diff --git a/quarkus/addons/source-files/runtime/pom.xml b/quarkus/addons/source-files/runtime/pom.xml
index a68bbb75a74..634a43a7c80 100644
--- a/quarkus/addons/source-files/runtime/pom.xml
+++ b/quarkus/addons/source-files/runtime/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>
-    <artifactId>kogito-addons-quarkus-source-files-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-source-files-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-quarkus-source-files</artifactId>
-  <name>Kogito Add-On Source Files</name>
+  <artifactId>kie-addons-quarkus-source-files</artifactId>
+  <name>KIE Add-On Source Files</name>
   <description>Provides access to source files for Quarkus</description>
 
     <properties>
@@ -67,8 +67,8 @@
             <artifactId>kogito-codegen-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-addons-quarkus-rest-exception-handler</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-addons-quarkus-rest-exception-handler</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/task-management/deployment/pom.xml b/quarkus/addons/task-management/deployment/pom.xml
index c73f8534d22..fab057127a6 100644
--- a/quarkus/addons/task-management/deployment/pom.xml
+++ b/quarkus/addons/task-management/deployment/pom.xml
@@ -41,7 +41,7 @@
       <artifactId>jbpm-addons-quarkus-task-management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/task-management/deployment/src/main/java/org/kie/kogito/task/management/deployment/KogitoAddOnTaskManagementProcessor.java b/quarkus/addons/task-management/deployment/src/main/java/org/kie/kogito/task/management/deployment/KogitoAddOnTaskManagementProcessor.java
index 8f3f36d32b9..b19ef3a6012 100644
--- a/quarkus/addons/task-management/deployment/src/main/java/org/kie/kogito/task/management/deployment/KogitoAddOnTaskManagementProcessor.java
+++ b/quarkus/addons/task-management/deployment/src/main/java/org/kie/kogito/task/management/deployment/KogitoAddOnTaskManagementProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnTaskManagementProcessor extends RequireCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-task-management-extension";
+    private static final String FEATURE = "jbpm-addon-task-management-extension";
 
     KogitoAddOnTaskManagementProcessor() {
         super(KogitoCapability.PROCESSES);
diff --git a/quarkus/addons/task-management/pom.xml b/quarkus/addons/task-management/pom.xml
index e89f0629693..f5378bc06a1 100644
--- a/quarkus/addons/task-management/pom.xml
+++ b/quarkus/addons/task-management/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/quarkus/addons/task-management/runtime/pom.xml b/quarkus/addons/task-management/runtime/pom.xml
index 8a54818be5f..d3849360e5b 100644
--- a/quarkus/addons/task-management/runtime/pom.xml
+++ b/quarkus/addons/task-management/runtime/pom.xml
@@ -42,8 +42,8 @@
       <artifactId>kogito-addons-task-management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-rest-exception-handler</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-rest-exception-handler</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/task-notification/deployment/pom.xml b/quarkus/addons/task-notification/deployment/pom.xml
index ac61eed2e81..f1cea80012d 100644
--- a/quarkus/addons/task-notification/deployment/pom.xml
+++ b/quarkus/addons/task-notification/deployment/pom.xml
@@ -40,7 +40,7 @@
       <artifactId>jbpm-addons-quarkus-task-notification</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/task-notification/deployment/src/main/java/org/kie/kogito/task/notification/quarkus/deployment/KogitoAddOnTaskNotificationProcessor.java b/quarkus/addons/task-notification/deployment/src/main/java/org/kie/kogito/task/notification/quarkus/deployment/KogitoAddOnTaskNotificationProcessor.java
index 67973bccf40..52336e3f1c0 100644
--- a/quarkus/addons/task-notification/deployment/src/main/java/org/kie/kogito/task/notification/quarkus/deployment/KogitoAddOnTaskNotificationProcessor.java
+++ b/quarkus/addons/task-notification/deployment/src/main/java/org/kie/kogito/task/notification/quarkus/deployment/KogitoAddOnTaskNotificationProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnTaskNotificationProcessor extends RequireCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-task-notification-extension";
+    private static final String FEATURE = "jbpm-addon-task-notification-extension";
 
     KogitoAddOnTaskNotificationProcessor() {
         super(KogitoCapability.PROCESSES);
diff --git a/quarkus/addons/task-notification/pom.xml b/quarkus/addons/task-notification/pom.xml
index 2619d0c7fc7..7716c4d882a 100644
--- a/quarkus/addons/task-notification/pom.xml
+++ b/quarkus/addons/task-notification/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/quarkus/addons/tracing-decision/deployment/pom.xml b/quarkus/addons/tracing-decision/deployment/pom.xml
index e3380183d0b..0b36d625754 100644
--- a/quarkus/addons/tracing-decision/deployment/pom.xml
+++ b/quarkus/addons/tracing-decision/deployment/pom.xml
@@ -23,12 +23,12 @@
          xmlns="http://maven.apache.org/POM/4.0.0">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-tracing-decision-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-tracing-decision-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-tracing-decision-deployment</artifactId>
-  <name>Kogito Add-On Tracing Decision - Deployment</name>
+  <artifactId>kie-addons-quarkus-tracing-decision-deployment</artifactId>
+  <name>KIE Add-On Tracing Decision - Deployment</name>
 
   <properties>
     <version.org.kie.kogito.trusty-service-postgresql>1.17.0</version.org.kie.kogito.trusty-service-postgresql>
@@ -37,11 +37,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-tracing-decision</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-tracing-decision</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
+      <groupId>org.kie</groupId>
       <artifactId>kogito-addons-quarkus-common-deployment</artifactId>
     </dependency>
     <dependency>
@@ -49,8 +49,8 @@
       <artifactId>kogito-quarkus-extension-spi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-explainability-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-explainability-deployment</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/quarkus/addons/tracing-decision/deployment/src/main/java/org/kie/kogito/tracing/decision/quarkus/deployment/KogitoAddOnTracingDecisionProcessor.java b/quarkus/addons/tracing-decision/deployment/src/main/java/org/kie/kogito/tracing/decision/quarkus/deployment/KogitoAddOnTracingDecisionProcessor.java
index 13fd18dc81e..c50c6b7f949 100644
--- a/quarkus/addons/tracing-decision/deployment/src/main/java/org/kie/kogito/tracing/decision/quarkus/deployment/KogitoAddOnTracingDecisionProcessor.java
+++ b/quarkus/addons/tracing-decision/deployment/src/main/java/org/kie/kogito/tracing/decision/quarkus/deployment/KogitoAddOnTracingDecisionProcessor.java
@@ -26,7 +26,7 @@
 
 class KogitoAddOnTracingDecisionProcessor extends RequireCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-tracing-decision-extension";
+    private static final String FEATURE = "kie-addon-tracing-decision-extension";
 
     KogitoAddOnTracingDecisionProcessor() {
         super(KogitoCapability.DECISIONS);
diff --git a/quarkus/addons/tracing-decision/integration-tests/pom.xml b/quarkus/addons/tracing-decision/integration-tests/pom.xml
index 379153ee544..013d08faeb2 100644
--- a/quarkus/addons/tracing-decision/integration-tests/pom.xml
+++ b/quarkus/addons/tracing-decision/integration-tests/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>
-    <artifactId>kogito-addons-quarkus-tracing-decision-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-quarkus-tracing-decision-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-tracing-decision-it</artifactId>
-  <name>Kogito Add-On Tracing Decision - Integration tests</name>
+  <artifactId>kie-addons-quarkus-tracing-decision-it</artifactId>
+  <name>KIE Add-On Tracing Decision - Integration tests</name>
 
   <properties>
       <java.module.name>org.kie.kogito.quarkus.tracing.decision.tests</java.module.name>
@@ -49,8 +49,8 @@
       <artifactId>drools-quarkus-decisions</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-tracing-decision</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-tracing-decision</artifactId>
     </dependency>
 
     <dependency>
@@ -85,8 +85,8 @@
     </dependency>
     <!-- this is used implicitly by parallel builds so let's make Maven aware of it -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-tracing-decision-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-tracing-decision-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/addons/tracing-decision/pom.xml b/quarkus/addons/tracing-decision/pom.xml
index 3bc3bc07778..7376a6ec7a1 100644
--- a/quarkus/addons/tracing-decision/pom.xml
+++ b/quarkus/addons/tracing-decision/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-quarkus-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-tracing-decision-parent</artifactId>
-  <name>Kogito Add-On Tracing Decision - Parent</name>
+  <artifactId>kie-addons-quarkus-tracing-decision-parent</artifactId>
+  <name>KIE Add-On Tracing Decision - Parent</name>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/quarkus/addons/tracing-decision/runtime/pom.xml b/quarkus/addons/tracing-decision/runtime/pom.xml
index 61e7d8141d0..dc2d36f0ab3 100644
--- a/quarkus/addons/tracing-decision/runtime/pom.xml
+++ b/quarkus/addons/tracing-decision/runtime/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-quarkus-tracing-decision-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-quarkus-tracing-decision-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-tracing-decision</artifactId>
-  <name>Kogito Add-On Tracing Decision</name>
+  <artifactId>kie-addons-quarkus-tracing-decision</artifactId>
+  <name>KIE Add-On Tracing Decision</name>
 
     <properties>
        <java.module.name>org.kie.kogito.quarkus.tracing.decision</java.module.name>
@@ -68,8 +68,8 @@
       <artifactId>kogito-addons-tracing-decision-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-explainability</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-explainability</artifactId>
     </dependency>
 
     <dependency>
diff --git a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java
index e6ca905b5d2..25d5c9e80cf 100644
--- a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java
+++ b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/KogitoDMNCodeCodestartIT.java
@@ -26,8 +26,8 @@
 
 import io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartData.QuarkusDataKey;
 import io.quarkus.devtools.testing.codestarts.QuarkusCodestartTest;
-import io.quarkus.maven.ArtifactCoords;
-import io.quarkus.maven.ArtifactKey;
+import io.quarkus.maven.dependency.ArtifactCoords;
+import io.quarkus.maven.dependency.ArtifactKey;
 
 import static io.quarkus.devtools.codestarts.quarkus.QuarkusCodestartCatalog.Language.JAVA;
 
@@ -52,9 +52,7 @@ public static String projectVersion() {
 
     @RegisterExtension
     public static QuarkusCodestartTest codestartTest = QuarkusCodestartTest.builder()
-            //.setupStandaloneExtensionTest("org.drools:drools-quarkus-decisions") //TODO Revert back once Quarkus LTS is upgraded to 2.10+
-            .standaloneExtensionCatalog()
-            .extension(ArtifactCoords.fromString("org.drools:drools-quarkus-decisions:" + projectVersion()))
+            .setupStandaloneExtensionTest("org.drools:drools-quarkus-decisions")
             .extension(ArtifactKey.fromString("io.quarkus:quarkus-resteasy-jackson")) // account for KOGITO-5817
             .extension(ArtifactCoords.fromString("org.assertj:assertj-core:" + assertjVersion()))
             .putData(QuarkusDataKey.APP_CONFIG, Map.of("quarkus.http.test-port", "0"))
diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-deployment/pom.xml
index e43f2da64f1..8d524df2b23 100644
--- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-deployment/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus-deployment/pom.xml
@@ -75,8 +75,8 @@
           <version>${project.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.kie.kogito</groupId>
-          <artifactId>kogito-quarkus-predictions-deployment</artifactId>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-quarkus-predictions-deployment</artifactId>
           <version>${project.version}</version>
         </dependency>
       </dependencies>
diff --git a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml
index 9936f63b75c..60e22aff45e 100644
--- a/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-extension/kogito-quarkus/pom.xml
@@ -63,8 +63,8 @@
           <artifactId>drools-quarkus-decisions</artifactId>
         </dependency>
         <dependency>
-          <groupId>org.kie.kogito</groupId>
-          <artifactId>kogito-quarkus-predictions</artifactId>
+          <groupId>org.kie</groupId>
+          <artifactId>kie-quarkus-predictions</artifactId>
         </dependency>
       </dependencies>
     </profile>
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-deployment/pom.xml
index 5a9d320bec3..0008e0846fb 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-deployment/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-deployment/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-quarkus-predictions-extension</artifactId>
-        <groupId>org.kie.kogito</groupId>
+        <artifactId>kie-quarkus-predictions-extension</artifactId>
+        <groupId>org.kie</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kogito-quarkus-predictions-deployment</artifactId>
-    <name>Kogito :: Quarkus Predictions Extension :: Deployment</name>
+    <artifactId>kie-quarkus-predictions-deployment</artifactId>
+    <name>KIE :: Quarkus Predictions Extension :: Deployment</name>
 
     <properties>
         <java.module.name>org.kie.kogito.quarkus.predictions.deployment</java.module.name>
@@ -43,8 +43,8 @@
             <artifactId>kogito-quarkus-common-deployment</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-predictions</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-quarkus-predictions</artifactId>
         </dependency>
 
         <!-- codegen dependencies -->
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml
index 2aad8b982ab..129aea1a644 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions-integration-test/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-quarkus-predictions-extension</artifactId>
-        <groupId>org.kie.kogito</groupId>
+        <artifactId>kie-quarkus-predictions-extension</artifactId>
+        <groupId>org.kie</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kogito-quarkus-predictions-integration-test</artifactId>
-    <name>Kogito :: Quarkus Predictions Extension :: Integration Tests</name>
+    <artifactId>kie-quarkus-predictions-integration-test</artifactId>
+    <name>KIE :: Quarkus Predictions Extension :: Integration Tests</name>
 
     <properties>
         <quarkus.test.list.include>true</quarkus.test.list.include>
@@ -40,8 +40,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-predictions</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-quarkus-predictions</artifactId>
         </dependency>
         <dependency>
             <groupId>org.kie.kogito</groupId>
@@ -74,8 +74,8 @@
 
         <!-- this is used implicitly by quarkus tests so let's make Maven aware of it -->
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-predictions-deployment</artifactId>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-quarkus-predictions-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml
index bca167e5b26..4680bc30360 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/kogito-quarkus-predictions/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>
-        <artifactId>kogito-quarkus-predictions-extension</artifactId>
-        <groupId>org.kie.kogito</groupId>
+        <artifactId>kie-quarkus-predictions-extension</artifactId>
+        <groupId>org.kie</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kogito-quarkus-predictions</artifactId>
-    <name>Kogito :: Quarkus Predictions Extension :: Runtime</name>
-    <description>Add Kogito predictions (PMML) capabilities - Include Drools PMML engine</description>
+    <artifactId>kie-quarkus-predictions</artifactId>
+    <name>KIE :: Quarkus Predictions Extension :: Runtime</name>
+    <description>Add KIE predictions (PMML) capabilities - Include Drools PMML engine</description>
 
     <properties>
         <java.module.name>org.kie.kogito.core.prediction.incubation.quarkus.support</java.module.name>
diff --git a/quarkus/extensions/kogito-quarkus-predictions-extension/pom.xml b/quarkus/extensions/kogito-quarkus-predictions-extension/pom.xml
index 7bc7b21d3da..3918f9c29cc 100644
--- a/quarkus/extensions/kogito-quarkus-predictions-extension/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-predictions-extension/pom.xml
@@ -29,8 +29,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-quarkus-predictions-extension</artifactId>
-  <name>Kogito :: Quarkus Predictions Extension</name>
+  <groupId>org.kie</groupId>
+  <artifactId>kie-quarkus-predictions-extension</artifactId>
+  <name>KIE :: Quarkus Predictions Extension</name>
 
   <packaging>pom</packaging>
 
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml
index 39fd6a56503..82c27de50c9 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-deployment/pom.xml
@@ -61,8 +61,8 @@
       <artifactId>kogito-quarkus-workflow-common-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkiverse.jackson-jq</groupId>
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
index 2bffc2265f4..f4bbb496981 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
@@ -45,8 +45,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-jdbc</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-jdbc</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -62,16 +62,16 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-events-process</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-events-process</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-elytron-security-properties-file</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management</artifactId>
     </dependency>
     <!-- Testing dependencies -->
     <dependency>
@@ -135,8 +135,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-jdbc-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-jdbc-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -148,8 +148,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-events-process-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-events-process-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -161,8 +161,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml
index 5cbbadae38c..6673f35fd0d 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/pom.xml
@@ -24,8 +24,8 @@
       <artifactId>kogito-quarkus-workflow-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-rest-exception-handler</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-rest-exception-handler</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -71,8 +71,8 @@
 
     <!-- Support CloudEvents OotB -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
diff --git a/quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml b/quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml
index ba796701e6a..9ef75e3e936 100644
--- a/quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml
+++ b/quarkus/integration-tests/integration-tests-kogito-plugin/pom.xml
@@ -63,8 +63,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml
index 5b51e000514..4308057591d 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-predictions/pom.xml
@@ -49,8 +49,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-predictions</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-quarkus-predictions</artifactId>
     </dependency>
 
     <dependency>
@@ -88,8 +88,8 @@
 
     <!-- this is used implicitly by quarkus tests so let's make Maven aware of it -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-predictions-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-quarkus-predictions-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-filesystem/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-filesystem/pom.xml
index ae90f4a0340..6d1a8057fc4 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-filesystem/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-filesystem/pom.xml
@@ -40,12 +40,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-filesystem</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-filesystem</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -80,8 +80,8 @@
     </dependency>
     <!-- this is used implicitly by Quarkus tests so let's make Maven aware of it -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-filesystem-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-filesystem-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -93,8 +93,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml
index e305a0929eb..c89ca244180 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-infinispan/pom.xml
@@ -43,12 +43,12 @@
       <artifactId>quarkus-infinispan-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-infinispan</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-infinispan</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -88,8 +88,8 @@
     </dependency>
     <!-- this is used implicitly by Quarkus tests so let's make Maven aware of it -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-infinispan-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-infinispan-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -101,8 +101,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/pom.xml
index f910d760f62..3f438f5a540 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/pom.xml
@@ -48,12 +48,12 @@
       <artifactId>quarkus-agroal</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-jdbc</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-jdbc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -67,8 +67,8 @@
     </dependency>
     <!-- this is used implicitly by Quarkus tests so let's make Maven aware of it -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-jdbc-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-jdbc-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -80,8 +80,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/pom.xml
index d91dd1e800e..88718303fcb 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-kafka-persistence/pom.xml
@@ -40,12 +40,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-kafka</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-kafka</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -59,8 +59,8 @@
     </dependency>
     <!-- this is used implicitly by Quarkus tests so let's make Maven aware of it -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-kafka-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-kafka-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -72,8 +72,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/pom.xml
index ca7045948ff..c6af99fdf7e 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-mongodb/pom.xml
@@ -44,12 +44,12 @@
       <artifactId>quarkus-mongodb-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-mongodb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-mongodb</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -63,8 +63,8 @@
     </dependency>
     <!-- this is used implicitly by Quarkus tests so let's make Maven aware of it -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-mongodb-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-mongodb-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -76,8 +76,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/pom.xml
index bfba09de004..ea04e21c365 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/pom.xml
@@ -40,16 +40,16 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-postgresql</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-postgresql</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-jdbc-postgresql</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -63,8 +63,8 @@
     </dependency>
     <!-- this is used implicitly by Quarkus tests so let's make Maven aware of it -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-persistence-postgresql-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-persistence-postgresql-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -76,8 +76,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
index d1a4769362a..d3e0280dcc7 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes-reactive/pom.xml
@@ -54,8 +54,8 @@
       <artifactId>jbpm-quarkus</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-svg</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-svg</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -128,8 +128,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-svg-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-svg-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
index 2b41a504527..aa39bc275b6 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-processes/pom.xml
@@ -54,28 +54,28 @@
       <artifactId>jbpm-quarkus</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-events-process</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-events-process</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm</groupId>
       <artifactId>jbpm-addons-quarkus-task-management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-svg</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-svg</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-monitoring-prometheus</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-monitoring-prometheus</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -160,8 +160,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-svg-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-svg-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -173,8 +173,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-process-management-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-process-management-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -186,8 +186,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-events-process-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-events-process-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -212,8 +212,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-messaging-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-messaging-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -225,8 +225,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-monitoring-prometheus-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-monitoring-prometheus-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml
index 3bcfa261019..079991f2f5e 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml
@@ -58,8 +58,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-source-files</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-source-files</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -102,8 +102,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-source-files-deployment</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-quarkus-source-files-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/springboot/addons/README.md b/springboot/addons/README.md
index 8ae0d173b87..ca0c597445b 100644
--- a/springboot/addons/README.md
+++ b/springboot/addons/README.md
@@ -4,30 +4,30 @@ In this module you will find all the add-ons supported by the community for Spri
 
 <!-- Please update this table in alphabetical order when creating a new add-on -->
 
-| Add-On Description      | Artifact ID                                     | Since  |
-|-------------------------|-------------------------------------------------|--------|
-| Events Decisions        | kogito-addons-springboot-events-decisions       | 1.2.0  |
-| Events Kafka            | kogito-addons-springboot-events-kafka           | 0.3.0  |
-| Events Predictions      | kogito-addons-springboot-events-predictions     | 1.12.0 |
-| Events Rules            | drools-addons-springboot-events-rules           | 1.12.0 |
-| Explainability          | kogito-addons-springboot-explainability         | 0.15.0 |
-| Jobs Management         | kogito-addons-springboot-jobs-management        | 0.6.0  |
-| Kubernetes              | kogito-addons-springboot-kubernetes             | 1.13.0 |
-| Mail                    | jbpm-addons-springboot-mail                     | 1.6.0  |
-| Messaging               | kogito-addons-springboot-messaging              | 1.0.0  |
-| Monitoring Elastic      | kogito-addons-springboot-monitoring-elastic     | 1.2.0  |
-| Monitoring Prometheus   | kogito-addons-springboot-monitoring-prometheus  | 0.1.0  |
-| Persistence File System | kogito-addons-springboot-persistence-filesystem | 1.21.0 |
-| Persistence Infinispan  | kogito-addons-springboot-persistence-infinispan | 1.21.0 |
-| Persistence JDBC        | kogito-addons-springboot-persistence-jdbc       | 1.21.0 |
-| Persistence MongoDB     | kogito-addons-springboot-persistence-mongodb    | 1.21.0 |
-| Persistence Postgresql  | kogito-addons-springboot-persistence-postgresql | 1.21.0 |
-| Process Management      | kogito-addons-springboot-process-management     | 0.3.0  |
-| Process SVG             | kogito-addons-springboot-process-svg            | 1.0.0  |
-| Task Management         | jbpm-addons-springboot-task-management          | 1.4.0  |
-| Task Notification       | jbpm-addons-springboot-task-notification        | 1.6.0  |
-| Tracing Decision        | kogito-addons-springboot-tracing-decision       | 0.11.0 |
-| Events MongoDB          | kogito-addons-springboot-events-mongodb         | 1.11.0 |
+| Add-On Description      | Artifact ID                                    | Since  |
+|-------------------------|------------------------------------------------|--------|
+| Events Decisions        | kie-addons-springboot-events-decisions         | 1.2.0  |
+| Events Kafka            | kie-addons-springboot-events-kafka             | 0.3.0  |
+| Events Predictions      | kie-addons-springboot-events-predictions       | 1.12.0 |
+| Events Rules            | drools-addons-springboot-events-rules          | 1.12.0 |
+| Explainability          | kie-addons-springboot-explainability           | 0.15.0 |
+| Jobs Management         | kogito-addons-springboot-jobs-management       | 0.6.0  |
+| Kubernetes              | kie-addons-springboot-kubernetes               | 1.13.0 |
+| Mail                    | jbpm-addons-springboot-mail                    | 1.6.0  |
+| Messaging               | kie-addons-springboot-messaging                | 1.0.0  |
+| Monitoring Elastic      | kie-addons-springboot-monitoring-elastic       | 1.2.0  |
+| Monitoring Prometheus   | kie-addons-springboot-monitoring-prometheus    | 0.1.0  |
+| Persistence File System | kie-addons-springboot-persistence-filesystem   | 1.21.0 |
+| Persistence Infinispan  | kie-addons-springboot-persistence-infinispan   | 1.21.0 |
+| Persistence JDBC        | kie-addons-springboot-persistence-jdbc         | 1.21.0 |
+| Persistence MongoDB     | kie-addons-springboot-persistence-mongodb      | 1.21.0 |
+| Persistence Postgresql  | kie-addons-springboot-persistence-postgresql   | 1.21.0 |
+| Process Management      | kie-addons-springboot-process-management       | 0.3.0  |
+| Process SVG             | kie-addons-springboot-process-svg              | 1.0.0  |
+| Task Management         | jbpm-addons-springboot-task-management         | 1.4.0  |
+| Task Notification       | jbpm-addons-springboot-task-notification       | 1.6.0  |
+| Tracing Decision        | kie-addons-springboot-tracing-decision         | 0.11.0 |
+| Events MongoDB          | kie-addons-springboot-events-mongodb           | 1.11.0 |
 
 ## Contributing
 
diff --git a/springboot/addons/events/decisions/pom.xml b/springboot/addons/events/decisions/pom.xml
index 0c5ef99c27b..2bdacbb22b9 100644
--- a/springboot/addons/events/decisions/pom.xml
+++ b/springboot/addons/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-springboot-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-springboot-events-decisions</artifactId>
-  <name>Kogito :: Add-Ons :: Events :: Event-Driven Decisions :: Spring Boot</name>
+  <artifactId>kie-addons-springboot-events-decisions</artifactId>
+  <name>KIE :: Add-Ons :: Events :: Event-Driven Decisions :: Spring Boot</name>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.eventdriven.decision</java.module.name>
@@ -42,8 +42,8 @@
       <artifactId>kogito-addons-events-decisions</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.annotation</groupId>
diff --git a/springboot/addons/events/decisions/src/main/resources/META-INF/kogito.addon b/springboot/addons/events/decisions/src/main/resources/META-INF/kogito.addon
index be27a1abf6b..0d2fc6c0ac8 100644
--- a/springboot/addons/events/decisions/src/main/resources/META-INF/kogito.addon
+++ b/springboot/addons/events/decisions/src/main/resources/META-INF/kogito.addon
@@ -1 +1 @@
-kogito-event-driven-decisions
\ No newline at end of file
+event-driven-decisions
\ No newline at end of file
diff --git a/springboot/addons/events/kafka/pom.xml b/springboot/addons/events/kafka/pom.xml
index 961efed12ae..36abb5fe7c2 100644
--- a/springboot/addons/events/kafka/pom.xml
+++ b/springboot/addons/events/kafka/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-springboot-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-springboot-events-process-kafka</artifactId>
-  <name>Kogito :: Add-Ons :: Events :: SprintBoot :: Process :: Kafka</name>
-  <description>Kogito Kafka Events for process based on Spring Boot Add-On</description>
+  <artifactId>kie-addons-springboot-events-process-kafka</artifactId>
+  <name>KIE :: Add-Ons :: Events :: SprintBoot :: Process :: Kafka</name>
+  <description>KIE Kafka Events for process based on Spring Boot Add-On</description>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.events.kafka</java.module.name>
diff --git a/springboot/addons/events/mongodb/pom.xml b/springboot/addons/events/mongodb/pom.xml
index 10dfc952661..0139970f8f1 100644
--- a/springboot/addons/events/mongodb/pom.xml
+++ b/springboot/addons/events/mongodb/pom.xml
@@ -24,15 +24,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-springboot-events-parent</artifactId>
+        <groupId>org.kie</groupId>
+        <artifactId>kie-addons-springboot-events-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>kogito-addons-springboot-events-mongodb</artifactId>
-    <name>Kogito :: Add-Ons :: Events ::  MongoDB :: SprintBoot</name>
-    <description>Kogito Events based on MongoDB and SpringBoot Add-On</description>
+    <artifactId>kie-addons-springboot-events-mongodb</artifactId>
+    <name>KIE :: Add-Ons :: Events ::  MongoDB :: SprintBoot</name>
+    <description>KIE Events based on MongoDB and SpringBoot Add-On</description>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.events.mongodb</java.module.name>
diff --git a/springboot/addons/events/pom.xml b/springboot/addons/events/pom.xml
index d36b1b36877..e4a13867f30 100644
--- a/springboot/addons/events/pom.xml
+++ b/springboot/addons/events/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-springboot-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-springboot-events-parent</artifactId>
-  <name>Kogito :: Add-Ons :: Spring Boot :: Events - Parent</name>
-  <description>Parent Module for Kogito Spring Boot Events Addons</description>
+  <artifactId>kie-addons-springboot-events-parent</artifactId>
+  <name>KIE :: Add-Ons :: Spring Boot :: Events - Parent</name>
+  <description>Parent Module for KIE Spring Boot Events Addons</description>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/springboot/addons/events/predictions/pom.xml b/springboot/addons/events/predictions/pom.xml
index f3269aabdcc..2d6ce331f3d 100644
--- a/springboot/addons/events/predictions/pom.xml
+++ b/springboot/addons/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-springboot-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
-  <artifactId>kogito-addons-springboot-events-predictions</artifactId>
-  <name>Kogito :: Add-Ons :: Events :: Event-Driven Predictions :: Spring Boot</name>
+  <artifactId>kie-addons-springboot-events-predictions</artifactId>
+  <name>KIE :: Add-Ons :: Events :: Event-Driven Predictions :: Spring Boot</name>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.events.predictions</java.module.name>
@@ -42,8 +42,8 @@
       <artifactId>kogito-addons-events-predictions</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.annotation</groupId>
diff --git a/springboot/addons/events/predictions/src/main/resources/META-INF/kogito.addon b/springboot/addons/events/predictions/src/main/resources/META-INF/kogito.addon
index 7ca1ca812ef..8ec135f490f 100644
--- a/springboot/addons/events/predictions/src/main/resources/META-INF/kogito.addon
+++ b/springboot/addons/events/predictions/src/main/resources/META-INF/kogito.addon
@@ -1 +1 @@
-kogito-event-driven-predictions
\ No newline at end of file
+event-driven-predictions
\ No newline at end of file
diff --git a/springboot/addons/events/rules/pom.xml b/springboot/addons/events/rules/pom.xml
index ebdaeede500..a352823616e 100644
--- a/springboot/addons/events/rules/pom.xml
+++ b/springboot/addons/events/rules/pom.xml
@@ -24,8 +24,8 @@
          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-springboot-events-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-events-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
 
@@ -43,8 +43,8 @@
       <artifactId>kogito-addons-events-rules</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>jakarta.annotation</groupId>
diff --git a/springboot/addons/explainability/pom.xml b/springboot/addons/explainability/pom.xml
index 3479a38608f..6f5dda2b343 100644
--- a/springboot/addons/explainability/pom.xml
+++ b/springboot/addons/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-springboot-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-springboot-explainability</artifactId>
-  <name>Kogito :: Add-Ons :: Explainability :: Spring Boot Addon</name>
+  <artifactId>kie-addons-springboot-explainability</artifactId>
+  <name>KIE :: Add-Ons :: Explainability :: Spring Boot Addon</name>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.events.explainability</java.module.name>
diff --git a/springboot/addons/jobs/pom.xml b/springboot/addons/jobs/pom.xml
index 52689d14b1c..119c5b3d630 100644
--- a/springboot/addons/jobs/pom.xml
+++ b/springboot/addons/jobs/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-springboot-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
diff --git a/springboot/addons/kubernetes/pom.xml b/springboot/addons/kubernetes/pom.xml
index 051ce015ea0..ce479db0ddd 100644
--- a/springboot/addons/kubernetes/pom.xml
+++ b/springboot/addons/kubernetes/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-springboot-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-springboot-kubernetes</artifactId>
-  <name>Kogito :: Add-Ons :: Spring Boot :: Kubernetes</name>
+  <artifactId>kie-addons-springboot-kubernetes</artifactId>
+  <name>KIE :: Add-Ons :: Spring Boot :: Kubernetes</name>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.addons.springboot.k8s</java.module.name>
diff --git a/springboot/addons/mail/pom.xml b/springboot/addons/mail/pom.xml
index f81cf017f57..b702ac73e6c 100644
--- a/springboot/addons/mail/pom.xml
+++ b/springboot/addons/mail/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-springboot-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/springboot/addons/messaging/implementation/pom.xml b/springboot/addons/messaging/implementation/pom.xml
index 8d9a6b58a87..f415d3f2089 100644
--- a/springboot/addons/messaging/implementation/pom.xml
+++ b/springboot/addons/messaging/implementation/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-springboot-messaging-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-messaging-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-springboot-messaging</artifactId>
-  <name>Kogito :: Add-Ons :: Messaging :: Spring Boot</name>
-  <description>Kogito Events handling for Messaging Add-On (Spring Boot)</description>
+  <artifactId>kie-addons-springboot-messaging</artifactId>
+  <name>KIE :: Add-Ons :: Messaging :: Spring Boot</name>
+  <description>KIE Events handling for Messaging Add-On (Spring Boot)</description>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.addon.cloudevents</java.module.name>
diff --git a/springboot/addons/messaging/integration-tests/pom.xml b/springboot/addons/messaging/integration-tests/pom.xml
index d4c97621274..c28573c0adb 100644
--- a/springboot/addons/messaging/integration-tests/pom.xml
+++ b/springboot/addons/messaging/integration-tests/pom.xml
@@ -26,13 +26,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-springboot-messaging-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-messaging-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-springboot-messaging-it</artifactId>
-  <name>Kogito :: Add-Ons :: Messaging :: Spring Boot (ITs)</name>
-  <description>Integration tests for for Messages AddOn (Spring Boot)</description>
+  <artifactId>kie-addons-springboot-messaging-it</artifactId>
+  <name>KIE :: Add-Ons :: Messaging :: Spring Boot (ITs)</name>
+  <description>Integration tests for Messages AddOn (Spring Boot)</description>
 
     <properties>
         <java.module.name>org.kie.kogito.addon.cloudevents.spring.tests</java.module.name>
@@ -96,8 +96,8 @@
       <artifactId>drools-decisions-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-messaging</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/pom.xml b/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/pom.xml
index 6aa4df4f0b1..441ae79acdc 100644
--- a/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/pom.xml
+++ b/springboot/addons/messaging/integration-tests/src/it/cloudevents-spring-boot-addon-it-invoked/pom.xml
@@ -56,8 +56,8 @@
       <artifactId>drools-decisions-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/springboot/addons/messaging/pom.xml b/springboot/addons/messaging/pom.xml
index 5819c63ff2d..5deab0e2742 100644
--- a/springboot/addons/messaging/pom.xml
+++ b/springboot/addons/messaging/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-springboot-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-springboot-messaging-parent</artifactId>
-  <name>Kogito :: Add-Ons :: CloudEvents :: Spring Boot</name>
-  <description>Kogito Events handling for Messaging Add-On (Spring Boot)</description>
+  <artifactId>kie-addons-springboot-messaging-parent</artifactId>
+  <name>KIE :: Add-Ons :: CloudEvents :: Spring Boot</name>
+  <description>KIE Events handling for Messaging Add-On (Spring Boot)</description>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/springboot/addons/monitoring/core/pom.xml b/springboot/addons/monitoring/core/pom.xml
index 17385823b64..3322a1c0846 100644
--- a/springboot/addons/monitoring/core/pom.xml
+++ b/springboot/addons/monitoring/core/pom.xml
@@ -23,13 +23,13 @@
          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-springboot-monitoring-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-springboot-monitoring-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <name>Kogito :: Add-Ons :: Monitoring Core Springboot</name>
-  <artifactId>kogito-addons-springboot-monitoring-core</artifactId>
+  <name>KIE :: Add-Ons :: Monitoring Core Springboot</name>
+  <artifactId>kie-addons-springboot-monitoring-core</artifactId>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.monitoring.core</java.module.name>
diff --git a/springboot/addons/monitoring/elastic/pom.xml b/springboot/addons/monitoring/elastic/pom.xml
index 4782275739f..ce84aeae4b8 100644
--- a/springboot/addons/monitoring/elastic/pom.xml
+++ b/springboot/addons/monitoring/elastic/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-springboot-monitoring-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-springboot-monitoring-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-springboot-monitoring-elastic</artifactId>
-  <name>Kogito :: Add-Ons :: Monitoring Elastic Springboot</name>
+  <artifactId>kie-addons-springboot-monitoring-elastic</artifactId>
+  <name>KIE :: Add-Ons :: Monitoring Elastic Springboot</name>
   <description>Monitoring Elastic Springboot</description>
 
   <properties>
@@ -43,8 +43,8 @@
       <artifactId>kogito-addons-monitoring-elastic</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-monitoring-core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/springboot/addons/monitoring/pom.xml b/springboot/addons/monitoring/pom.xml
index ae5d7e09998..04dd3529a7f 100644
--- a/springboot/addons/monitoring/pom.xml
+++ b/springboot/addons/monitoring/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-springboot-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-springboot-monitoring-parent</artifactId>
-  <name>Kogito :: Add-Ons :: Spring Boot :: Monitoring :: Parent</name>
-  <description>Kogito Monitoring Addons for Spring Boot</description>
+  <artifactId>kie-addons-springboot-monitoring-parent</artifactId>
+  <name>KIE :: Add-Ons :: Spring Boot :: Monitoring :: Parent</name>
+  <description>KIE Monitoring Addons for Spring Boot</description>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/springboot/addons/monitoring/prometheus/pom.xml b/springboot/addons/monitoring/prometheus/pom.xml
index 46a4b95bea4..1144fd1661f 100644
--- a/springboot/addons/monitoring/prometheus/pom.xml
+++ b/springboot/addons/monitoring/prometheus/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>
-    <artifactId>kogito-addons-springboot-monitoring-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>kie-addons-springboot-monitoring-parent</artifactId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <name>Kogito :: Add-Ons :: Monitoring Prometheus Springboot</name>
+  <name>KIE :: Add-Ons :: Monitoring Prometheus Springboot</name>
 
   <description>Prometheus monitoring for Springboot</description>
-  <artifactId>kogito-addons-springboot-monitoring-prometheus</artifactId>
+  <artifactId>kie-addons-springboot-monitoring-prometheus</artifactId>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.monitoring.prometheus</java.module.name>
@@ -43,8 +43,8 @@
       <artifactId>kogito-addons-monitoring-prometheus</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-monitoring-core</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-monitoring-core</artifactId>
     </dependency>
 
     <!-- test dependencies -->
diff --git a/springboot/addons/persistence/filesystem/pom.xml b/springboot/addons/persistence/filesystem/pom.xml
index b642df5ef34..594e9debd56 100644
--- a/springboot/addons/persistence/filesystem/pom.xml
+++ b/springboot/addons/persistence/filesystem/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-springboot-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <name>Kogito :: Add-Ons :: Persistence File System :: Springboot</name>
+  <name>KIE :: Add-Ons :: Persistence File System :: Springboot</name>
 
   <description>File System persistence for Springboot</description>
-  <artifactId>kogito-addons-springboot-persistence-filesystem</artifactId>
+  <artifactId>kie-addons-springboot-persistence-filesystem</artifactId>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.persistence.filesystem</java.module.name>
diff --git a/springboot/addons/persistence/infinispan/pom.xml b/springboot/addons/persistence/infinispan/pom.xml
index 2be7116e0bc..0f9237aeba6 100644
--- a/springboot/addons/persistence/infinispan/pom.xml
+++ b/springboot/addons/persistence/infinispan/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-springboot-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <name>Kogito :: Add-Ons :: Persistence Infinispan :: Springboot</name>
+  <name>KIE :: Add-Ons :: Persistence Infinispan :: Springboot</name>
 
   <description>Infinispan persistence for Springboot</description>
-  <artifactId>kogito-addons-springboot-persistence-infinispan</artifactId>
+  <artifactId>kie-addons-springboot-persistence-infinispan</artifactId>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.persistence.infinispan</java.module.name>
diff --git a/springboot/addons/persistence/jdbc/pom.xml b/springboot/addons/persistence/jdbc/pom.xml
index f8fa0be5bcd..e2bec34c5b3 100644
--- a/springboot/addons/persistence/jdbc/pom.xml
+++ b/springboot/addons/persistence/jdbc/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-springboot-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <name>Kogito :: Add-Ons :: Persistence JDBC :: Springboot</name>
+  <name>KIE :: Add-Ons :: Persistence JDBC :: Springboot</name>
 
   <description>JDBC persistence for Springboot</description>
-  <artifactId>kogito-addons-springboot-persistence-jdbc</artifactId>
+  <artifactId>kie-addons-springboot-persistence-jdbc</artifactId>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.persistence.jdbc</java.module.name>
diff --git a/springboot/addons/persistence/mongodb/pom.xml b/springboot/addons/persistence/mongodb/pom.xml
index 8277a9cce20..37c38d52bc5 100644
--- a/springboot/addons/persistence/mongodb/pom.xml
+++ b/springboot/addons/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-springboot-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <name>Kogito :: Add-Ons :: Persistence MongoDB :: Springboot</name>
+  <name>KIE :: Add-Ons :: Persistence MongoDB :: Springboot</name>
 
   <description>MongoDB persistence for Springboot</description>
-  <artifactId>kogito-addons-springboot-persistence-mongodb</artifactId>
+  <artifactId>kie-addons-springboot-persistence-mongodb</artifactId>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.persistence.mongodb</java.module.name>
diff --git a/springboot/addons/persistence/pom.xml b/springboot/addons/persistence/pom.xml
index 121b6e294e2..c9f813e2f5d 100644
--- a/springboot/addons/persistence/pom.xml
+++ b/springboot/addons/persistence/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>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-springboot-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-springboot-persistence-parent</artifactId>
-  <name>Kogito :: Add-Ons :: Spring Boot :: Persistence :: Parent</name>
-  <description>Kogito Persistence Addons for Spring Boot</description>
+  <artifactId>kie-addons-springboot-persistence-parent</artifactId>
+  <name>KIE :: Add-Ons :: Spring Boot :: Persistence :: Parent</name>
+  <description>KIE Persistence Addons for Spring Boot</description>
   <packaging>pom</packaging>
 
   <modules>
diff --git a/springboot/addons/persistence/postgresql/pom.xml b/springboot/addons/persistence/postgresql/pom.xml
index 92b59b6b927..4ea44f88ea2 100644
--- a/springboot/addons/persistence/postgresql/pom.xml
+++ b/springboot/addons/persistence/postgresql/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-springboot-persistence-parent</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-addons-springboot-persistence-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <name>Kogito :: Add-Ons :: Persistence PostgreSQL :: Springboot</name>
+  <name>KIE :: Add-Ons :: Persistence PostgreSQL :: Springboot</name>
 
   <description>PostgreSQL persistence for Springboot</description>
-  <artifactId>kogito-addons-springboot-persistence-postgresql</artifactId>
+  <artifactId>kie-addons-springboot-persistence-postgresql</artifactId>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.persistence.postgresql</java.module.name>
diff --git a/springboot/addons/pom.xml b/springboot/addons/pom.xml
index 197923d300b..46fd6ecde80 100644
--- a/springboot/addons/pom.xml
+++ b/springboot/addons/pom.xml
@@ -29,6 +29,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
+  <groupId>org.kie</groupId>
   <artifactId>kogito-addons-springboot-parent</artifactId>
   <name>Kogito :: Add-Ons :: Spring Boot</name>
   <description>Parent Module for Kogito Spring Boot Addons</description>
diff --git a/springboot/addons/process-management/pom.xml b/springboot/addons/process-management/pom.xml
index ba6c410f636..9a1487e8093 100644
--- a/springboot/addons/process-management/pom.xml
+++ b/springboot/addons/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-springboot-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-springboot-process-management</artifactId>
-  <name>Kogito :: Add-Ons :: Process Management :: Spring Boot Addon</name>
+  <artifactId>kie-addons-springboot-process-management</artifactId>
+  <name>KIE :: Add-Ons :: Process Management :: Spring Boot Addon</name>
   <description>Management of process instances for Spring Boot</description>
 
   <properties>
@@ -70,8 +70,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-rest-exception-handler</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-rest-exception-handler</artifactId>
     </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/springboot/addons/process-svg/pom.xml b/springboot/addons/process-svg/pom.xml
index 0ee12097140..d70bc4d13ad 100644
--- a/springboot/addons/process-svg/pom.xml
+++ b/springboot/addons/process-svg/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-springboot-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-springboot-process-svg</artifactId>
-  <name>Kogito :: Add-Ons :: Process SVG :: Spring Boot Addon</name>
+  <artifactId>kie-addons-springboot-process-svg</artifactId>
+  <name>KIE :: Add-Ons :: Process SVG :: Spring Boot Addon</name>
   <description>Springboot Addon to interact with Process SVG Service</description>
 
   <properties>
diff --git a/springboot/addons/rest-exception-handler/pom.xml b/springboot/addons/rest-exception-handler/pom.xml
index 4f8d5ce194d..404cc54f4ab 100644
--- a/springboot/addons/rest-exception-handler/pom.xml
+++ b/springboot/addons/rest-exception-handler/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>
+    <groupId>org.kie</groupId>
     <artifactId>kogito-addons-springboot-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-springboot-rest-exception-handler</artifactId>
-  <name>Kogito :: Rest Exception Handler:: Spring Boot</name>
-  <description>Kogito exception handling for Spring Boot</description>
+  <artifactId>kie-addons-springboot-rest-exception-handler</artifactId>
+  <name>KIE :: Rest Exception Handler:: Spring Boot</name>
+  <description>KIE exception handling for Spring Boot</description>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.resource.exceptions</java.module.name>
diff --git a/springboot/addons/task-management/pom.xml b/springboot/addons/task-management/pom.xml
index 175a47a930f..afd8fa0cc08 100644
--- a/springboot/addons/task-management/pom.xml
+++ b/springboot/addons/task-management/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-springboot-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -44,8 +44,8 @@
       <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-rest-exception-handler</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-rest-exception-handler</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
diff --git a/springboot/addons/task-notification/pom.xml b/springboot/addons/task-notification/pom.xml
index e92bc85bd62..88118cc3054 100644
--- a/springboot/addons/task-notification/pom.xml
+++ b/springboot/addons/task-notification/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-springboot-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
diff --git a/springboot/addons/tracing-decision/pom.xml b/springboot/addons/tracing-decision/pom.xml
index 86767d8a3f2..77c69984249 100644
--- a/springboot/addons/tracing-decision/pom.xml
+++ b/springboot/addons/tracing-decision/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-springboot-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <groupId>org.kie</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-springboot-tracing-decision</artifactId>
-  <name>Kogito :: Add-Ons :: Tracing :: Spring Boot</name>
+  <artifactId>kie-addons-springboot-tracing-decision</artifactId>
+  <name>KIE :: Add-Ons :: Tracing :: Spring Boot</name>
 
   <properties>
       <java.module.name>org.kie.kogito.springboot.task.tracing.decision</java.module.name>
@@ -43,8 +43,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-explainability</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-explainability</artifactId>
     </dependency>
 
     <dependency>
diff --git a/springboot/archetype/README.md b/springboot/archetype/README.md
index ec97b9a3bcd..fc99e2a0dc0 100644
--- a/springboot/archetype/README.md
+++ b/springboot/archetype/README.md
@@ -37,7 +37,7 @@ The list of valid Kogito Spring Boot Starters are:
 1. [`decisions`](../starters/drools-decisions-spring-boot-starter)
 2. [`processes`](../starters/jbpm-spring-boot-starter)
 3. [`rules`](../starters/drools-rules-spring-boot-starter)
-4. [`predictions`](../starters/kogito-predictions-spring-boot-starter)
+4. [`predictions`](../starters/kie-predictions-spring-boot-starter)
 
 ## Adding Kogito Add-Ons
 
@@ -62,7 +62,7 @@ For a list of valid add-ons, see these listings:
 - [Runtime Independent Add-Ons](../../addons)
 
 Please note that you don't need to add the suffix `kogito-addons-springboot` to the name of the addon. For example, to
-include `kogito-addons-springboot-monitoring-prometheus` just use `monitoring-prometheus`. For runtime independent
+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`
 use `persistence-infinispan`.
 
diff --git a/springboot/archetype/pom.xml b/springboot/archetype/pom.xml
index d1478c1bbcc..42cbd1878e4 100644
--- a/springboot/archetype/pom.xml
+++ b/springboot/archetype/pom.xml
@@ -59,8 +59,8 @@
       <artifactId>jbpm-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-monitoring-prometheus</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-monitoring-prometheus</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -74,8 +74,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-predictions-spring-boot-starter</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-predictions-spring-boot-starter</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
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 0a16e17fda5..aa3d7f6efdc 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
@@ -35,7 +35,7 @@ def startersToArtifactIds(String starters) {
             [id: "processes", starter: "jbpm-spring-boot-starter"],
             [id: "rules", starter: "drools-rules-spring-boot-starter"],
             [id: "decisions", starter: "drools-decisions-spring-boot-starter"],
-            [id: "predictions", starter: "kogito-predictions-spring-boot-starter"]
+            [id: "predictions", starter: "kie-predictions-spring-boot-starter"]
     ]
     def startersList = starters.split(",")
     return startersList.collect { starterId ->
@@ -54,7 +54,9 @@ def resolveAddonGroupId(String artifactId) {
             return "org.drools"
         case { artifactId.startsWith("jbpm-") }:
             return "org.jbpm"
-        default: return "org.kie.kogito"
+        case { artifactId.startsWith("sonataflow-") }:
+            return "org.apache.sonataflow"
+        default: return "org.kie"
     }
 }
 
@@ -68,25 +70,25 @@ def addonsToArtifactsIds(String addons) {
     // this list should be maintained manually for now for each generic/spring boot add-on we create
     // see: https://issues.redhat.com/browse/KOGITO-5619
     def validAddons = [
-            [id: "persistence-filesystem", addon: "kogito-addons-springboot-persistence-filesystem"],
-            [id: "persistence-infinispan", addon: "kogito-addons-springboot-persistence-infinispan"],
-            [id: "persistence-jdbc", addon: "kogito-addons-springboot-persistence-jdbc"],
-            [id: "persistence-mongodb", addon: "kogito-addons-springboot-persistence-mongodb"],
-            [id: "persistence-postgresql", addon: "kogito-addons-springboot-persistence-postgresql"],
+            [id: "persistence-filesystem", addon: "kie-addons-springboot-persistence-filesystem"],
+            [id: "persistence-infinispan", addon: "kie-addons-springboot-persistence-infinispan"],
+            [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: "messaging", addon: "kogito-addons-springboot-messaging"],
-            [id: "events-decisions", addon: "kogito-addons-springboot-events-decisions"],
-            [id: "events-process-kafka", addon: "kogito-addons-springboot-events-process-kafka"],
-            [id: "explainability", addon: "kogito-addons-springboot-explainability"],
+            [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"],
+            [id: "explainability", addon: "kie-addons-springboot-explainability"],
             [id: "jobs-management", addon: "kogito-addons-springboot-jobs-management"],
             [id: "mail", addon: "jbpm-addons-springboot-mail"],
-            [id: "monitoring-elastic", addon: "kogito-addons-springboot-monitoring-elastic"],
-            [id: "monitoring-prometheus", addon: "kogito-addons-springboot-monitoring-prometheus"],
-            [id: "process-management", addon: "kogito-addons-springboot-process-management"],
-            [id: "process-svg", addon: "kogito-addons-springboot-process-svg"],
+            [id: "monitoring-elastic", addon: "kie-addons-springboot-monitoring-elastic"],
+            [id: "monitoring-prometheus", addon: "kie-addons-springboot-monitoring-prometheus"],
+            [id: "process-management", addon: "kie-addons-springboot-process-management"],
+            [id: "process-svg", addon: "kie-addons-springboot-process-svg"],
             [id: "task-management", addon: "jbpm-addons-springboot-task-management"],
             [id: "task-notification", addon: "jbpm-addons-springboot-task-notification"],
-            [id: "tracing-decision", addon: "kogito-addons-springboot-tracing-decision"]
+            [id: "tracing-decision", addon: "kie-addons-springboot-tracing-decision"]
     ]
     def addonsList = addons.split(",")
     return addonsList.collect { addonId ->
diff --git a/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithXmlTest.groovy b/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithXmlTest.groovy
index ef9f3f8c5e5..4628e19fe4c 100644
--- a/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithXmlTest.groovy
+++ b/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithXmlTest.groovy
@@ -42,7 +42,7 @@ class AddDependencyToPomWithXmlTest extends Specification {
 
         when:
         Node newDep = new Node(null, "dependency",
-                [groupId: "org.kie.kogito", artifactId: "kogito-addons-springboot-messaging", version: "999-SNAPSHOT"])
+                [groupId: "org.kie", artifactId: "kie-addons-springboot-messaging", version: "999-SNAPSHOT"])
         pomXml.dependencies[0].children().add(0, newDep)
 
         then:
@@ -58,7 +58,7 @@ class AddDependencyToPomWithXmlTest extends Specification {
         for (String artifact : artifacts) {
             Node depNode = new Node(null, "dependency")
             depNode.appendNode("version", null, '${kogito.version}')
-            depNode.appendNode("groupId", null, "org.kie.kogito")
+            depNode.appendNode("groupId", null, "org.kie")
             depNode.appendNode("artifactId", null, "kogito-addons-springboot-" + artifact)
             pomXml.dependencies[0].children().add(0, depNode)
         }
diff --git a/springboot/archetype/src/test/resources/projects/it-custom-process/verify.groovy b/springboot/archetype/src/test/resources/projects/it-custom-process/verify.groovy
index 8365292bfbb..77ec10e6e28 100644
--- a/springboot/archetype/src/test/resources/projects/it-custom-process/verify.groovy
+++ b/springboot/archetype/src/test/resources/projects/it-custom-process/verify.groovy
@@ -34,4 +34,4 @@ assert pomContent.contains("jbpm-spring-boot-starter")
 assert !pomContent.contains("jbpm-with-drools-spring-boot-starter")
 
 // monitoring-prometheus addon was specified
-assert pomContent.contains("kogito-addons-springboot-monitoring-prometheus")
\ No newline at end of file
+assert pomContent.contains("kie-addons-springboot-monitoring-prometheus")
\ No newline at end of file
diff --git a/springboot/integration-tests/pom.xml b/springboot/integration-tests/pom.xml
index ac7a989d549..8079ddab7b8 100644
--- a/springboot/integration-tests/pom.xml
+++ b/springboot/integration-tests/pom.xml
@@ -83,20 +83,20 @@
       <artifactId>drools-decisions-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-predictions-spring-boot-starter</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-predictions-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-messaging</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-spring-boot-test-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-monitoring-prometheus</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-monitoring-prometheus</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm</groupId>
@@ -107,41 +107,41 @@
       <artifactId>jbpm-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jbpm</groupId>
       <artifactId>jbpm-addons-springboot-task-management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-process-svg</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-process-svg</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-events-process-kafka</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-events-process-kafka</artifactId>
     </dependency>
     <!-- Persistence -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-persistence-infinispan</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-persistence-infinispan</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-persistence-postgresql</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-persistence-postgresql</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-persistence-mongodb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-persistence-mongodb</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-persistence-jdbc</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-persistence-jdbc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-persistence-filesystem</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-persistence-filesystem</artifactId>
     </dependency>
 
     <dependency>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml
index 0b9fd05561a..67b083de821 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-decisions-it/pom.xml
@@ -54,13 +54,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-predictions-spring-boot-starter</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-predictions-spring-boot-starter</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-monitoring-prometheus</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-monitoring-prometheus</artifactId>
     </dependency>
 
     <dependency>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/pom.xml
index fa442f9c915..767e7e39a29 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-kafka-it/pom.xml
@@ -54,13 +54,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-messaging</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-messaging</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-events-process-kafka</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-events-process-kafka</artifactId>
     </dependency>
 
     <dependency>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml
index 5ff0b8a760f..ade9547f382 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-it/pom.xml
@@ -54,8 +54,8 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-process-management</artifactId>
     </dependency>
 
     <dependency>
@@ -64,13 +64,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-process-svg</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-process-svg</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-monitoring-prometheus</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-monitoring-prometheus</artifactId>
     </dependency>
 
     <dependency>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-filesystem/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-filesystem/pom.xml
index 84ecd5aab8e..95dedd0e097 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-filesystem/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-filesystem/pom.xml
@@ -38,12 +38,12 @@
       <artifactId>jbpm-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-persistence-filesystem</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-persistence-filesystem</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
index beca15c76eb..bd21124d47b 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-infinispan/pom.xml
@@ -54,15 +54,16 @@
       <artifactId>spring-boot-starter-actuator</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-persistence-infinispan</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-persistence-infinispan</artifactId>
     </dependency>
     <dependency>
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-spring-boot3-starter-remote</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>      <artifactId>kogito-addons-springboot-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-jdbc/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-jdbc/pom.xml
index f02c5f798a2..93bc7d9f7a6 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-jdbc/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-jdbc/pom.xml
@@ -46,12 +46,12 @@
       <artifactId>jbpm-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-persistence-jdbc</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-persistence-jdbc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-mongodb/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-mongodb/pom.xml
index 73dff1cfaa4..bee96b6b910 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-mongodb/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-mongodb/pom.xml
@@ -38,16 +38,16 @@
       <artifactId>jbpm-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-persistence-mongodb</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-persistence-mongodb</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-mongodb</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-postgresql/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-postgresql/pom.xml
index 956bd77c798..bcaa22f7b23 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-postgresql/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/integration-tests-springboot-processes-postgresql/pom.xml
@@ -38,8 +38,8 @@
       <artifactId>jbpm-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-persistence-postgresql</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-persistence-postgresql</artifactId>
     </dependency>
     <!-- Adding PostgreSQL JDBC because of Flyway -->
     <dependency>
@@ -51,8 +51,8 @@
       <artifactId>spring-boot-starter-jdbc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
diff --git a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/pom.xml b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/pom.xml
index 1907716e622..6a08772528c 100644
--- a/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/pom.xml
+++ b/springboot/integration-tests/src/it/integration-tests-springboot-processes-persistence-it/pom.xml
@@ -67,8 +67,8 @@
       <artifactId>jbpm-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-springboot-process-management</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-addons-springboot-process-management</artifactId>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/springboot/starters/README.md b/springboot/starters/README.md
index 1766ce4faf1..905d7fd5b86 100644
--- a/springboot/starters/README.md
+++ b/springboot/starters/README.md
@@ -66,8 +66,8 @@ Adds Predictions (PMML) to your Kogito Spring Boot project:
 
 <dependencies>
   <dependency>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-predictions-spring-boot-starter</artifactId>
+    <groupId>org.kie</groupId>
+    <artifactId>kie-predictions-spring-boot-starter</artifactId>
   </dependency>
 </dependencies>
 ```
diff --git a/springboot/starters/kogito-predictions-spring-boot-starter/pom.xml b/springboot/starters/kogito-predictions-spring-boot-starter/pom.xml
index 2e9033c18a5..e39d00290d9 100644
--- a/springboot/starters/kogito-predictions-spring-boot-starter/pom.xml
+++ b/springboot/starters/kogito-predictions-spring-boot-starter/pom.xml
@@ -29,9 +29,10 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-predictions-spring-boot-starter</artifactId>
-  <name>Kogito :: Spring Boot :: Starter :: Predictions</name>
-  <description>Spring Boot Starter for Kogito Predictions (PMML). Contains everything you need to get started with Kogito Predictions!</description>
+  <groupId>org.kie</groupId>
+  <artifactId>kie-predictions-spring-boot-starter</artifactId>
+  <name>KIE :: Spring Boot :: Starter :: Predictions</name>
+  <description>Spring Boot Starter for KIE Predictions (PMML). Contains everything you need to get started with KIE Predictions!</description>
 
   <properties>
     <java.module.name>org.kie.kogito.springboot.starter.predictions</java.module.name>
diff --git a/springboot/starters/kogito-spring-boot-starter/pom.xml b/springboot/starters/kogito-spring-boot-starter/pom.xml
index dd15a1f289b..be7967ec105 100644
--- a/springboot/starters/kogito-spring-boot-starter/pom.xml
+++ b/springboot/starters/kogito-spring-boot-starter/pom.xml
@@ -52,8 +52,8 @@
       <artifactId>drools-decisions-spring-boot-starter</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-predictions-spring-boot-starter</artifactId>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-predictions-spring-boot-starter</artifactId>
     </dependency>
   </dependencies>