diff --git a/kogito-bom/pom.xml b/kogito-bom/pom.xml
index 88acb71c35b..e41b899a855 100755
--- a/kogito-bom/pom.xml
+++ b/kogito-bom/pom.xml
@@ -269,24 +269,24 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-camel</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-addons-quarkus-camel</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-camel</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-addons-quarkus-camel</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-camel-deployment</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-addons-quarkus-camel-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-camel-deployment</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-addons-quarkus-camel-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -1992,24 +1992,24 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-serverless-workflow-python</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-addons-quarkus-python</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-serverless-workflow-python</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-addons-quarkus-python</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
        <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-serverless-workflow-python-deployment</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-addons-quarkus-python-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-addons-quarkus-serverless-workflow-python-deployment</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-addons-quarkus-python-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
@@ -2247,19 +2247,19 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-quarkus</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-quarkus</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.kie.kogito</groupId>
-        <artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-quarkus-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -2314,23 +2314,23 @@
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.sonataflow</groupId>
+        <groupId>org.apache.sonataflow</groupId>
         <artifactId>sonataflow-quarkus-devui</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.sonataflow</groupId>
+        <groupId>org.apache.sonataflow</groupId>
         <artifactId>sonataflow-quarkus-devui</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
-        <groupId>org.sonataflow</groupId>
+        <groupId>org.apache.sonataflow</groupId>
         <artifactId>sonataflow-quarkus-devui-deployment</artifactId>
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.sonataflow</groupId>
+        <groupId>org.apache.sonataflow</groupId>
         <artifactId>sonataflow-quarkus-devui-deployment</artifactId>
         <version>${project.version}</version>
         <classifier>sources</classifier>
diff --git a/quarkus/addons/camel/deployment/pom.xml b/quarkus/addons/camel/deployment/pom.xml
index 1afe2d820a7..f0257d1a676 100644
--- a/quarkus/addons/camel/deployment/pom.xml
+++ b/quarkus/addons/camel/deployment/pom.xml
@@ -23,8 +23,8 @@
          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-camel-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>sonataflow-addons-quarkus-camel-parent</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -33,21 +33,21 @@
      <java.module.name>org.kie.kogito.addons.quarkus.camel.deployment</java.module.name>
   </properties>
 
-  <name>Kogito :: Add-Ons :: Quarkus :: Camel :: Deployment</name>
-  <description>Kogito Quarkus Camel Integration with Serverless Workflow</description>
-  <artifactId>kogito-addons-quarkus-camel-deployment</artifactId>
+  <name>SonataFlow :: Add-Ons :: Quarkus :: Camel :: Deployment</name>
+  <description>SonataFlow Quarkus Camel Integration with Serverless Workflow</description>
+  <artifactId>sonataflow-addons-quarkus-camel-deployment</artifactId>
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-arc-deployment</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-camel</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-addons-quarkus-camel</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus-deployment</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
diff --git a/quarkus/addons/camel/deployment/src/main/java/org/kie/kogito/addons/quarkus/camel/deployment/KogitoAddonsQuarkusCamelProcessor.java b/quarkus/addons/camel/deployment/src/main/java/org/kie/kogito/addons/quarkus/camel/deployment/KogitoAddonsQuarkusCamelProcessor.java
index 3140eba93ea..2a632b2519b 100644
--- a/quarkus/addons/camel/deployment/src/main/java/org/kie/kogito/addons/quarkus/camel/deployment/KogitoAddonsQuarkusCamelProcessor.java
+++ b/quarkus/addons/camel/deployment/src/main/java/org/kie/kogito/addons/quarkus/camel/deployment/KogitoAddonsQuarkusCamelProcessor.java
@@ -26,7 +26,7 @@
 
 public class KogitoAddonsQuarkusCamelProcessor extends RequireCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addons-quarkus-camel";
+    private static final String FEATURE = "sonataflow-addons-quarkus-camel";
 
     public KogitoAddonsQuarkusCamelProcessor() {
         super(KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/camel/integration-tests/pom.xml b/quarkus/addons/camel/integration-tests/pom.xml
index 5ab376bb8bd..91c757ae3a0 100644
--- a/quarkus/addons/camel/integration-tests/pom.xml
+++ b/quarkus/addons/camel/integration-tests/pom.xml
@@ -23,16 +23,16 @@
          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-camel-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>sonataflow-addons-quarkus-camel-parent</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
 
-  <name>Kogito :: Add-Ons :: Quarkus :: Camel :: Integration Tests</name>
-  <description>Kogito Quarkus Camel Integration with Serverless Workflow</description>
-  <artifactId>kogito-addons-quarkus-camel-integration-tests</artifactId>
+  <name>SonataFlow :: Add-Ons :: Quarkus :: Camel :: Integration Tests</name>
+  <description>SonataFlow Quarkus Camel Integration with Serverless Workflow</description>
+  <artifactId>sonataflow-addons-quarkus-camel-integration-tests</artifactId>
 
   <properties>
      <java.module.name>org.kie.kogito.addons.quarkus.camel.integration.test</java.module.name>
@@ -40,12 +40,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-camel</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-addons-quarkus-camel</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -83,8 +83,8 @@
 
     <!-- this is used implicitly by quarkus tests so let's make Maven aware of it. necessary to run the tests in parallel. -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-camel-deployment</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-addons-quarkus-camel-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
@@ -96,8 +96,8 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/addons/camel/pom.xml b/quarkus/addons/camel/pom.xml
index a74bb233108..28e09b73f7a 100644
--- a/quarkus/addons/camel/pom.xml
+++ b/quarkus/addons/camel/pom.xml
@@ -29,9 +29,10 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-addons-quarkus-camel-parent</artifactId>
-  <name>Kogito :: Add-Ons :: Quarkus :: Camel :: Parent</name>
-  <description>Kogito Quarkus Camel Integration with Serverless Workflow</description>
+  <groupId>org.apache.sonataflow</groupId>
+  <artifactId>sonataflow-addons-quarkus-camel-parent</artifactId>
+  <name>SonataFlow :: Add-Ons :: Quarkus :: Camel :: Parent</name>
+  <description>SonataFlow Quarkus Camel Integration with Serverless Workflow</description>
   <modules>
     <module>deployment</module>
     <module>runtime</module>
diff --git a/quarkus/addons/camel/runtime/pom.xml b/quarkus/addons/camel/runtime/pom.xml
index 26cd079fbb7..d1e3ef621ce 100644
--- a/quarkus/addons/camel/runtime/pom.xml
+++ b/quarkus/addons/camel/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-camel-parent</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>sonataflow-addons-quarkus-camel-parent</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <name>Kogito :: Add-Ons :: Quarkus :: Camel :: Runtimes</name>
-  <description>Kogito Quarkus Camel Integration with Serverless Workflow</description>
-  <artifactId>kogito-addons-quarkus-camel</artifactId>
+  <name>SonataFlow :: Add-Ons :: Quarkus :: Camel :: Runtimes</name>
+  <description>SonataFlow Quarkus Camel Integration with Serverless Workflow</description>
+  <artifactId>sonataflow-addons-quarkus-camel</artifactId>
 
   <properties>
      <java.module.name>org.kie.kogito.addons.quarkus.camel.runtime</java.module.name>
@@ -40,8 +40,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.camel.quarkus</groupId>
@@ -74,7 +74,7 @@
             <configuration>
               <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
               <capabilities>
-                <provides>org.sonataflow.addons.camel</provides>
+                <provides>org.apache.sonataflow.addons.camel</provides>
               </capabilities>
             </configuration>
           </execution>
@@ -94,4 +94,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>
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..536e2e1a314 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
@@ -32,7 +32,7 @@ public final class KogitoCapability {
     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 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");
+    public static final KogitoCapability SERVERLESS_WORKFLOW = new KogitoCapability("org.apache.sonataflow.serverless-workflow", "sonataflow-quarkus");
 
     public static final List<KogitoCapability> ENGINES = asList(
             KogitoCapability.DECISIONS,
diff --git a/quarkus/addons/knative/eventing/integration-tests/pom.xml b/quarkus/addons/knative/eventing/integration-tests/pom.xml
index 948970e3cf9..6e40b3b1216 100644
--- a/quarkus/addons/knative/eventing/integration-tests/pom.xml
+++ b/quarkus/addons/knative/eventing/integration-tests/pom.xml
@@ -50,8 +50,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+            <groupId>org.apache.sonataflow</groupId>
+            <artifactId>sonataflow-quarkus</artifactId>
         </dependency>
         <dependency>
             <groupId>org.kie.kogito</groupId>
@@ -76,8 +76,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-serverless-workflow-deployment</artifactId>
+            <groupId>org.apache.sonataflow</groupId>
+            <artifactId>sonataflow-quarkus-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>
diff --git a/quarkus/addons/knative/serving/integration-tests/pom.xml b/quarkus/addons/knative/serving/integration-tests/pom.xml
index de2a06f37bd..029c6897833 100644
--- a/quarkus/addons/knative/serving/integration-tests/pom.xml
+++ b/quarkus/addons/knative/serving/integration-tests/pom.xml
@@ -55,8 +55,8 @@
             <artifactId>quarkus-smallrye-openapi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+            <groupId>org.apache.sonataflow</groupId>
+            <artifactId>sonataflow-quarkus</artifactId>
         </dependency>
 
         <dependency>
@@ -117,8 +117,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
+            <groupId>org.apache.sonataflow</groupId>
+            <artifactId>sonataflow-quarkus-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/quarkus/addons/kubernetes/integration-tests/pom.xml b/quarkus/addons/kubernetes/integration-tests/pom.xml
index bc7c7e06ac1..3b0c9afdf79 100644
--- a/quarkus/addons/kubernetes/integration-tests/pom.xml
+++ b/quarkus/addons/kubernetes/integration-tests/pom.xml
@@ -38,8 +38,8 @@
             <artifactId>quarkus-smallrye-openapi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+            <groupId>org.apache.sonataflow</groupId>
+            <artifactId>sonataflow-quarkus</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/quarkus/addons/messaging/integration-tests/pom.xml b/quarkus/addons/messaging/integration-tests/pom.xml
index c23b0396b0d..6c3d644070a 100644
--- a/quarkus/addons/messaging/integration-tests/pom.xml
+++ b/quarkus/addons/messaging/integration-tests/pom.xml
@@ -37,8 +37,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -82,8 +82,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-serverless-workflow-deployment</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
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..fbc893a5568 100644
--- a/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml
+++ b/quarkus/addons/microprofile-config-service-catalog/integration-tests/pom.xml
@@ -55,8 +55,8 @@
             <artifactId>quarkus-smallrye-openapi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+            <groupId>org.apache.sonataflow</groupId>
+            <artifactId>sonataflow-quarkus</artifactId>
         </dependency>
 
         <dependency>
@@ -93,8 +93,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
+            <groupId>org.apache.sonataflow</groupId>
+            <artifactId>sonataflow-quarkus-deployment</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/quarkus/addons/process-management/integration-tests/pom.xml b/quarkus/addons/process-management/integration-tests/pom.xml
index 6c43331a608..9923a790e9c 100644
--- a/quarkus/addons/process-management/integration-tests/pom.xml
+++ b/quarkus/addons/process-management/integration-tests/pom.xml
@@ -51,8 +51,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
@@ -68,8 +68,8 @@
     </dependency>
      <!-- hack for CI to work -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/addons/python/deployment/pom.xml b/quarkus/addons/python/deployment/pom.xml
index 63309b45272..8d6bc0210da 100644
--- a/quarkus/addons/python/deployment/pom.xml
+++ b/quarkus/addons/python/deployment/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-serverless-workflow-python-parent</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
+    <artifactId>sonataflow-addons-quarkus-python-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-serverless-workflow-python-deployment</artifactId>
-  <name>Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Deployment</name>
+  <artifactId>sonataflow-addons-quarkus-python-deployment</artifactId>
+  <name>SonataFlow:: Addons :: Quarkus:: Serverless Workflow:: Python:: Deployment</name>
   <description>Python support for serverless workflow</description>
 
     <properties>
@@ -36,8 +36,8 @@
   
   <dependencies>
   <dependency>
-    <groupId>org.kie.kogito</groupId>
-    <artifactId>kogito-addons-quarkus-serverless-workflow-python</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
+    <artifactId>sonataflow-addons-quarkus-python</artifactId>
   </dependency>
   <dependency>
     <groupId>org.kie.kogito</groupId>
diff --git a/quarkus/addons/python/deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonAddonCapabilityProcessor.java b/quarkus/addons/python/deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonAddonCapabilityProcessor.java
index 0bd959e5a4a..b06562426b7 100644
--- a/quarkus/addons/python/deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonAddonCapabilityProcessor.java
+++ b/quarkus/addons/python/deployment/src/main/java/org/kie/kogito/quarkus/serverless/workflow/python/PythonAddonCapabilityProcessor.java
@@ -26,7 +26,7 @@
 
 class PythonAddonCapabilityProcessor extends OneOfCapabilityKogitoAddOnProcessor {
 
-    private static final String FEATURE = "kogito-addon-serverless-workflow-python";
+    private static final String FEATURE = "sonataflow-addons-quarkus-python";
 
     PythonAddonCapabilityProcessor() {
         super(KogitoCapability.SERVERLESS_WORKFLOW);
diff --git a/quarkus/addons/python/integration-tests/pom.xml b/quarkus/addons/python/integration-tests/pom.xml
index 8c75e584df8..7f1bda76af5 100644
--- a/quarkus/addons/python/integration-tests/pom.xml
+++ b/quarkus/addons/python/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-serverless-workflow-python-parent</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
+    <artifactId>sonataflow-addons-quarkus-python-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-serverless-workflow-python-integration-tests</artifactId>
-  <name>Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Integration Test</name>
+  <artifactId>sonataflow-addons-quarkus-python-integration-tests</artifactId>
+  <name>SonataFlow:: Addons :: Quarkus:: Serverless Workflow:: Python:: Integration Test</name>
   <description>Serverless Workflow Python Quarkus Addons Testing</description>
 
 
@@ -46,12 +46,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-addons-quarkus-serverless-workflow-python</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-addons-quarkus-python</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -63,8 +63,8 @@
     </dependency>
      <!-- hack for CI to work -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
diff --git a/quarkus/addons/python/pom.xml b/quarkus/addons/python/pom.xml
index 973916b8e25..fc4a15db868 100644
--- a/quarkus/addons/python/pom.xml
+++ b/quarkus/addons/python/pom.xml
@@ -25,8 +25,9 @@
     <artifactId>kogito-addons-quarkus-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>kogito-addons-quarkus-serverless-workflow-python-parent</artifactId>
-  <name>Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Parent</name>
+  <groupId>org.apache.sonataflow</groupId>
+  <artifactId>sonataflow-addons-quarkus-python-parent</artifactId>
+  <name>SonataFlow:: Addons :: Quarkus:: Serverless Workflow:: Python:: Parent</name>
   <description>Serverless Workflow Python Quarkus Addons</description>
   <packaging>pom</packaging>
   <modules>
diff --git a/quarkus/addons/python/runtime/pom.xml b/quarkus/addons/python/runtime/pom.xml
index 54a31b35d8b..db181cae8da 100644
--- a/quarkus/addons/python/runtime/pom.xml
+++ b/quarkus/addons/python/runtime/pom.xml
@@ -22,13 +22,13 @@
          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-serverless-workflow-python-parent</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
+    <artifactId>sonataflow-addons-quarkus-python-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <name>Kogito:: Addons :: Quarkus:: Serverless Workflow:: Python:: Runtime</name>
+  <name>SonataFlow:: Addons :: Quarkus:: Serverless Workflow:: Python:: Runtime</name>
   <description>Python support for serverless workflow</description>
-  <artifactId>kogito-addons-quarkus-serverless-workflow-python</artifactId>
+  <artifactId>sonataflow-addons-quarkus-python</artifactId>
   
     <properties>
        <java.module.name>org.kie.kogito.quarkus.serverless.workflow.python</java.module.name>
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..79f6a04d910 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
@@ -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-serverless-workflow-extension</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>sonataflow-quarkus-extension</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
-  <name>Kogito :: Quarkus Serverless Workflow Extension :: Deployment</name>
+  <artifactId>sonataflow-quarkus-deployment</artifactId>
+  <name>SonataFlow :: Quarkus Serverless Workflow Extension :: Deployment</name>
 
   <properties>
         <java.module.name>org.kie.kogito.serverless.workflow.deployment</java.module.name>
@@ -39,8 +39,8 @@
   <dependencies>
     <!-- Runtime dependencies -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus</artifactId>
     </dependency>
 
     <dependency>
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml
index 09f1887e572..3512395cf8e 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-extension-live-reload-test/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-quarkus-serverless-workflow-extension</artifactId>
+        <groupId>org.apache.sonataflow</groupId>
+        <artifactId>sonataflow-quarkus-extension</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
 
-    <artifactId>kogito-quarkus-serverless-workflow-extension-live-reload-test</artifactId>
-    <name>Kogito :: Quarkus Serverless Workflow Extension :: Live Reload Tests</name>
+    <artifactId>sonataflow-quarkus-extension-live-reload-test</artifactId>
+    <name>SonataFlow :: Quarkus Serverless Workflow Extension :: Live Reload Tests</name>
 
   <properties>
         <java.module.name>org.kie.kogito.quarkus.serverless.workflow.deployment.livereload</java.module.name>
@@ -38,8 +38,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+            <groupId>org.apache.sonataflow</groupId>
+            <artifactId>sonataflow-quarkus</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -105,8 +105,8 @@
 
         <!-- these are used implicitly by quarkus tests so let's make Maven aware of them -->
         <dependency>
-            <groupId>org.kie.kogito</groupId>
-            <artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
+            <groupId>org.apache.sonataflow</groupId>
+            <artifactId>sonataflow-quarkus-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-image-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml
index e33f43b6ae3..844062fd552 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-integration-test/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-image-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-serverless-workflow-extension</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>sonataflow-quarkus-extension</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-quarkus-serverless-workflow-image-integration-test</artifactId>
-  <name>Kogito :: Quarkus Serverless Workflow Extension :: Image Integration Tests</name>
+  <artifactId>sonataflow-quarkus-image-integration-test</artifactId>
+  <name>SonataFlow :: Quarkus Serverless Workflow Extension :: Image Integration Tests</name>
 
   <properties>
         <java.module.name>org.kie.kogito.quarkus.workflows.image.tests</java.module.name>
@@ -38,8 +38,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -67,8 +67,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-serverless-workflow-deployment</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus-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-integration-test/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/pom.xml
index 2bffc2265f4..d71365de6c3 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
@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>kogito-quarkus-serverless-workflow-extension</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>sonataflow-quarkus-extension</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-quarkus-serverless-workflow-integration-test</artifactId>
-  <name>Kogito :: Quarkus Serverless Workflow Extension :: Integration Tests</name>
+  <artifactId>sonataflow-quarkus-integration-test</artifactId>
+  <name>SonataFlow :: Quarkus Serverless Workflow Extension :: Integration Tests</name>
 
   <properties>
     <quarkus.test.list.include>true</quarkus.test.list.include>
@@ -24,8 +24,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -122,8 +122,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-serverless-workflow-deployment</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus-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-integration-test/src/test/java/org/kie/kogito/quarkus/ServerlessWorkflowCodestartTest.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/ServerlessWorkflowCodestartTest.java
index e19e46ed9ab..4b3a860a0e6 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/ServerlessWorkflowCodestartTest.java
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/ServerlessWorkflowCodestartTest.java
@@ -33,7 +33,7 @@ public class ServerlessWorkflowCodestartTest {
 
     @RegisterExtension
     public static QuarkusCodestartTest codestartTest = QuarkusCodestartTest.builder()
-            .setupStandaloneExtensionTest("org.kie.kogito:kogito-quarkus-serverless-workflow")
+            .setupStandaloneExtensionTest("org.sonataflow:sonataflow-quarkus")
             .extension(ArtifactKey.fromString("io.quarkus:quarkus-config-yaml"))
             .putData(QuarkusCodestartData.QuarkusDataKey.APP_CONFIG, Map.of("quarkus.devservices.enabled", "false"))
             .languages(JAVA)
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..4531543f671 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
@@ -3,15 +3,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>kogito-quarkus-serverless-workflow-extension</artifactId>
-    <groupId>org.kie.kogito</groupId>
+    <artifactId>sonataflow-quarkus-extension</artifactId>
+    <groupId>org.apache.sonataflow</groupId>
     <version>999-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-quarkus-serverless-workflow</artifactId>
-  <name>Kogito :: Quarkus Serverless Workflow Extension :: Runtime</name>
-  <description>Add Kogito Serverless Workflows (SW) capabilities - Includes the Process engine capability</description>
+  <artifactId>sonataflow-quarkus</artifactId>
+  <name>SonataFlow :: Quarkus Serverless Workflow Extension :: Runtime</name>
+  <description>Add SonataFlow Serverless Workflows (SW) capabilities - Includes the Process engine capability</description>
 
   <properties>
         <java.module.name>org.kie.kogito.serverless.workflow</java.module.name>
@@ -159,7 +159,7 @@
             <configuration>
               <deployment>${project.groupId}:${project.artifactId}-deployment:${project.version}</deployment>
               <capabilities>
-                <provides>org.sonataflow.serverless-workflow</provides>
+                <provides>org.apache.sonataflow.serverless-workflow</provides>
               </capabilities>
             </configuration>
           </execution>
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/README.tpl.qute.md
similarity index 100%
rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/README.tpl.qute.md
rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/README.tpl.qute.md
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html
similarity index 100%
rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html
rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/src/main/resources/META-INF/resources/index.entry.qute.html
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/src/main/resources/greet.sw.json b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/src/main/resources/greet.sw.json
similarity index 100%
rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/base/src/main/resources/greet.sw.json
rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/base/src/main/resources/greet.sw.json
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/codestart.yml
similarity index 58%
rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml
rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/codestart.yml
index 774a2e22373..f7c37505ef9 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/codestart.yml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/codestart.yml
@@ -1,15 +1,15 @@
-name: kogito-serverless-workflow-codestart
-ref: kogito-serverless-workflow
+name: sonataflow-serverless-workflow-codestart
+ref: sonataflow-serverless-workflow
 type: code
 tags: extension-codestart
 metadata:
-  title: Kogito Serverless Workflow codestart
+  title: SonataFlow Serverless Workflow codestart
   description: This is an example Kogito Serverless Workflow Quarkus codestart, it contains a sample Serverless Workflow definition for REST code generation.
-  related-guide-section: https://quarkus.io/guides/kogito
+  related-guide-section: https://quarkus.io/guides/sonataflow
 language:
   base:
     dependencies:
-      - org.kie.kogito:kogito-quarkus-serverless-workflow
+      - org.apache.sonataflow:sonataflow-quarkus
       - io.quarkus:quarkus-resteasy-jackson
     test-dependencies:
       - io.rest-assured:rest-assured
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/java/src/test/java/org/acme/GreetTest.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/java/src/test/java/org/acme/GreetTest.java
similarity index 100%
rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/java/src/test/java/org/acme/GreetTest.java
rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/java/src/test/java/org/acme/GreetTest.java
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/java/src/test/resources/application.yml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/java/src/test/resources/application.yml
similarity index 100%
rename from quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/kogito-serverless-workflow-codestart/java/src/test/resources/application.yml
rename to quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/codestarts/quarkus/sonataflow-quarkus-codestart/java/src/test/resources/application.yml
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml
index 8d3d81b0047..8ed4688ebd7 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow/src/main/resources/META-INF/quarkus-extension.yaml
@@ -9,7 +9,7 @@ metadata:
     - "workflows"
     - "SW"
     - "SWF"
-  guide: "https://quarkus.io/guides/kogito"
+  guide: "https://quarkus.io/guides/sonataflow"
   categories:
     - "cloud"
   status: "preview"
@@ -19,4 +19,4 @@ metadata:
     name: "kogito-serverless-workflow-codestart"
     languages:
       - "java"
-    artifact: "org.kie.kogito:kogito-quarkus-serverless-workflow:codestarts:jar:${project.version}"
\ No newline at end of file
+    artifact: "org.apache.sonataflow:sonataflow-quarkus:codestarts:jar:${project.version}"
\ No newline at end of file
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml
index 38616b206f9..e2066ce64e5 100644
--- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml
+++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/pom.xml
@@ -29,8 +29,9 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>kogito-quarkus-serverless-workflow-extension</artifactId>
-  <name>Kogito :: Quarkus Serverless Workflow Extension</name>
+  <groupId>org.apache.sonataflow</groupId>
+  <artifactId>sonataflow-quarkus-extension</artifactId>
+  <name>SonataFlow :: Quarkus Serverless Workflow Extension</name>
 
   <packaging>pom</packaging>
 
diff --git a/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml b/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml
index 42f42f5f38e..210a13ff089 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-openapi-client/pom.xml
@@ -49,14 +49,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus</artifactId>
     </dependency>
 
-    <!-- this is used implicitly by kogito-quarkus-serverless-workflow, let's make Maven parallel build to be aware of it. -->
+    <!-- this is used implicitly by sonataflow-quarkus, let's make Maven parallel build to be aware of it. -->
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow-deployment</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus-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..001129e7585 100644
--- a/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml
+++ b/quarkus/integration-tests/integration-tests-quarkus-source-files/pom.xml
@@ -53,8 +53,8 @@
       <artifactId>quarkus-smallrye-openapi</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.kie.kogito</groupId>
-      <artifactId>kogito-quarkus-serverless-workflow</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus</artifactId>
     </dependency>
 
     <dependency>
@@ -89,8 +89,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-serverless-workflow-deployment</artifactId>
+      <groupId>org.apache.sonataflow</groupId>
+      <artifactId>sonataflow-quarkus-deployment</artifactId>
       <version>${project.version}</version>
       <type>pom</type>
       <scope>test</scope>
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..560df65155c 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
@@ -54,6 +54,8 @@ def resolveAddonGroupId(String artifactId) {
             return "org.drools"
         case { artifactId.startsWith("jbpm-") }:
             return "org.jbpm"
+        case { artifactId.startsWith("sonataflow-") }:
+            return "org.apache.sonataflow"
         default: return "org.kie.kogito"
     }
 }