diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 886095427..7cb240996 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -25,7 +25,7 @@ pipeline {
                 script {
                     // load `pr_check.groovy` file from kogito-pipelines:main
                     dir('kogito-pipelines') {
-                        checkout(githubscm.resolveRepository('incubator-kie-kogito-pipelines', 'apache', 'main', false, 'kie-ci')) // TODO to change back to kiegroup:main
+                        checkout(githubscm.resolveRepository('incubator-kie-kogito-pipelines', 'apache', 'main', false, 'kie-ci'))
                         pr_check_script = load 'dsl/scripts/pr_check.groovy'
                     }
                 }
diff --git a/README.adoc b/README.adoc
index b1f9ead37..6b08ddba8 100644
--- a/README.adoc
+++ b/README.adoc
@@ -33,8 +33,8 @@ Run the https://www.optaplanner.org/[OptaPlanner] quickstarts now:
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
-$ cd optaplanner-quickstarts
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
+$ cd incubator-kie-optaplanner-quickstarts
 $ ./runQuickstartsFromSource.sh
 ----
 
diff --git a/build/optaplanner-distribution/src/main/assembly/resources/ReadMe.txt b/build/optaplanner-distribution/src/main/assembly/resources/ReadMe.txt
index 44701c8f8..bbde96a83 100644
--- a/build/optaplanner-distribution/src/main/assembly/resources/ReadMe.txt
+++ b/build/optaplanner-distribution/src/main/assembly/resources/ReadMe.txt
@@ -12,7 +12,7 @@ On Windows:
 Run the quickstarts in IDE
 ----------------------------
 
-Please refer to https://github.com/kiegroup/optaplanner-quickstarts/blob/stable/README.adoc.
+Please refer to https://github.com/apache/incubator-kie-optaplanner-quickstarts/blob/stable/README.adoc.
 
 Run the examples
 ----------------
@@ -56,7 +56,7 @@ Sources
 -------
 
 But to build from sources, pull the sources with git:
-  https://github.com/kiegroup/optaplanner
+  https://github.com/apache/incubator-kie-optaplanner
 
 Backwards compatibility
 -----------------------
diff --git a/build/quickstarts-showcase/src/main/resources/META-INF/resources/index.html b/build/quickstarts-showcase/src/main/resources/META-INF/resources/index.html
index 3fe909457..226022874 100644
--- a/build/quickstarts-showcase/src/main/resources/META-INF/resources/index.html
+++ b/build/quickstarts-showcase/src/main/resources/META-INF/resources/index.html
@@ -14,7 +14,7 @@
         </a>
         <ul class="navbar-nav mr-auto">
             <li class="nav-item">
-                <a class="nav-link" href="https://github.com/kiegroup/optaplanner-quickstarts" target="_blank">Source code</a>
+                <a class="nav-link" href="https://github.com/apache/incubator-kie-optaplanner-quickstarts" target="_blank">Source code</a>
             </li>
             <li class="nav-item">
                 <a class="nav-link" href="https://www.optaplanner.org/learn/documentation.html" target="_blank">Documentation</a>
diff --git a/hello-world/README.adoc b/hello-world/README.adoc
index 3cda676d7..15de9f86b 100644
--- a/hello-world/README.adoc
+++ b/hello-world/README.adoc
@@ -8,9 +8,9 @@ Assign lessons to timeslots and rooms to produce a better schedule for teachers
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/hello-world
+$ cd incubator-kie-optaplanner-quickstarts/hello-world
 ----
 
 . Start the application with Maven:
diff --git a/technology/java-activemq-quarkus/README.adoc b/technology/java-activemq-quarkus/README.adoc
index fce93c2e0..35f5bee26 100644
--- a/technology/java-activemq-quarkus/README.adoc
+++ b/technology/java-activemq-quarkus/README.adoc
@@ -11,9 +11,9 @@ The quickstart consists of two modules:
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/technology/java-activemq-quarkus
+$ cd incubator-kie-optaplanner-quickstarts/technology/java-activemq-quarkus
 ----
 
 . Build the project:
diff --git a/technology/java-spring-boot/README.adoc b/technology/java-spring-boot/README.adoc
index ae342bf3e..bd31df6e6 100644
--- a/technology/java-spring-boot/README.adoc
+++ b/technology/java-spring-boot/README.adoc
@@ -13,9 +13,9 @@ image::../../build/quickstarts-showcase/src/main/resources/META-INF/resources/sc
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/technology/java-spring-boot
+$ cd incubator-kie-optaplanner-quickstarts/technology/java-spring-boot
 ----
 
 . Start the application with Maven:
diff --git a/technology/kotlin-quarkus/README.adoc b/technology/kotlin-quarkus/README.adoc
index d5c5bdff9..d4b67b340 100644
--- a/technology/kotlin-quarkus/README.adoc
+++ b/technology/kotlin-quarkus/README.adoc
@@ -16,9 +16,9 @@ image::../../build/quickstarts-showcase/src/main/resources/META-INF/resources/sc
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/technology/kotlin-quarkus
+$ cd incubator-kie-optaplanner-quickstarts/technology/kotlin-quarkus
 ----
 
 . Start the application with Maven:
@@ -92,7 +92,7 @@ To deploy the application on OpenShift:
 . In the OpenShift web console, verify that the top left combobox is set to _Developer_ (not _Administrator_).
 . In the menu, select *Add* to create an application.
 . Under *Git Repository*, click *Import from Git* and fill in these parameters:
-.. Set *Git Repo URL* to `https://github.com/kiegroup/optaplanner-quickstarts`
+.. Set *Git Repo URL* to `https://github.com/apache/incubator-kie-optaplanner-quickstarts`
 .. Under _Show advanced Git options_, set *Context dir* to `/technology/kotlin-quarkus`
 .. Press the *Create* button.
 . In the _Topology_ view, there is a new deployment:
diff --git a/technology/kubernetes/README.adoc b/technology/kubernetes/README.adoc
index 92e5d869a..cc8e0bb15 100644
--- a/technology/kubernetes/README.adoc
+++ b/technology/kubernetes/README.adoc
@@ -73,7 +73,7 @@ Follow the https://keda.sh/docs/deploy/[documentation] to install the KEDA opera
 
 ==== Deploy the OptaPlanner Operator
 
-Follow the https://github.com/kiegroup/optaplanner/tree/main/optaplanner-operator#deploy-the-optaplanner-operator[README] to install the OptaPlanner operator.
+Follow the https://github.com/apache/incubator-kie-optaplanner/tree/main/optaplanner-operator#deploy-the-optaplanner-operator[README] to install the OptaPlanner operator.
 
 ==== Deploy the Demo App
 
diff --git a/use-cases/call-center/README.adoc b/use-cases/call-center/README.adoc
index b080d0fc5..2f5277f72 100644
--- a/use-cases/call-center/README.adoc
+++ b/use-cases/call-center/README.adoc
@@ -16,9 +16,9 @@ image::../../build/quickstarts-showcase/src/main/resources/META-INF/resources/sc
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/use-cases/call-center
+$ cd incubator-kie-optaplanner-quickstarts/use-cases/call-center
 ----
 
 . Start the application with Maven:
@@ -87,7 +87,7 @@ To deploy the application on OpenShift:
 . In the OpenShift web console, verify that the top left combobox is set to _Developer_ (not _Administrator_).
 . In the menu, select *Add* to create an application.
 . Under *Git Repository*, click *Import from Git* and fill in these parameters:
-.. Set *Git Repo URL* to `https://github.com/kiegroup/optaplanner-quickstarts`
+.. Set *Git Repo URL* to `https://github.com/apache/incubator-kie-optaplanner-quickstarts`
 .. Under _Show advanced Git options_, set *Context dir* to `/use-cases/call-center`
 .. Press the *Create* button.
 . In the _Topology_ view, there is a new deployment:
diff --git a/use-cases/employee-scheduling/README.adoc b/use-cases/employee-scheduling/README.adoc
index 4753231be..dec2c2f5e 100644
--- a/use-cases/employee-scheduling/README.adoc
+++ b/use-cases/employee-scheduling/README.adoc
@@ -16,9 +16,9 @@ image::../../build/quickstarts-showcase/src/main/resources/META-INF/resources/sc
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/use-cases/employee-scheduling
+$ cd incubator-kie-optaplanner-quickstarts/use-cases/employee-scheduling
 ----
 
 . Start the application with Maven:
@@ -87,7 +87,7 @@ To deploy the application on OpenShift:
 . In the OpenShift web console, verify that the top left combobox is set to _Developer_ (not _Administrator_).
 . In the menu, select *Add* to create an application.
 . Under *Git Repository*, click *Import from Git* and fill in these parameters:
-.. Set *Git Repo URL* to `https://github.com/kiegroup/optaplanner-quickstarts`
+.. Set *Git Repo URL* to `https://github.com/apache/incubator-kie-optaplanner-quickstarts`
 .. Under _Show advanced Git options_, set *Context dir* to `/use-cases/employee-scheduling`
 .. Press the *Create* button.
 . In the _Topology_ view, there is a new deployment:
diff --git a/use-cases/facility-location/README.adoc b/use-cases/facility-location/README.adoc
index b90412dd4..83adb9361 100644
--- a/use-cases/facility-location/README.adoc
+++ b/use-cases/facility-location/README.adoc
@@ -16,9 +16,9 @@ image::../../build/quickstarts-showcase/src/main/resources/META-INF/resources/sc
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/use-cases/facility-location
+$ cd incubator-kie-optaplanner-quickstarts/use-cases/facility-location
 ----
 
 . Start the application with Maven:
@@ -87,7 +87,7 @@ To deploy the application on OpenShift:
 . In the OpenShift web console, verify that the top left combobox is set to _Developer_ (not _Administrator_).
 . In the menu, select *Add* to create an application.
 . Under *Git Repository*, click *Import from Git* and fill in these parameters:
-.. Set *Git Repo URL* to `https://github.com/kiegroup/optaplanner-quickstarts`
+.. Set *Git Repo URL* to `https://github.com/apache/incubator-kie-optaplanner-quickstarts`
 .. Under _Show advanced Git options_, set *Context dir* to `/use-cases/facility-location`
 .. Press the *Create* button.
 . In the _Topology_ view, there is a new deployment:
diff --git a/use-cases/maintenance-scheduling/README.adoc b/use-cases/maintenance-scheduling/README.adoc
index 5b61f2a48..d7e981c2b 100644
--- a/use-cases/maintenance-scheduling/README.adoc
+++ b/use-cases/maintenance-scheduling/README.adoc
@@ -16,9 +16,9 @@ image::../../build/quickstarts-showcase/src/main/resources/META-INF/resources/sc
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/use-cases/maintenance-scheduling
+$ cd incubator-kie-optaplanner-quickstarts/use-cases/maintenance-scheduling
 ----
 
 . Start the application with Maven:
@@ -87,7 +87,7 @@ To deploy the application on OpenShift:
 . In the OpenShift web console, verify that the top left combobox is set to _Developer_ (not _Administrator_).
 . In the menu, select *Add* to create an application.
 . Under *Git Repository*, click *Import from Git* and fill in these parameters:
-.. Set *Git Repo URL* to `https://github.com/kiegroup/optaplanner-quickstarts`
+.. Set *Git Repo URL* to `https://github.com/apache/incubator-kie-optaplanner-quickstarts`
 .. Under _Show advanced Git options_, set *Context dir* to `/use-cases/maintenance-scheduling`
 .. Press the *Create* button.
 . In the _Topology_ view, there is a new deployment:
diff --git a/use-cases/order-picking/README.adoc b/use-cases/order-picking/README.adoc
index e0dbcf150..493b71ebf 100644
--- a/use-cases/order-picking/README.adoc
+++ b/use-cases/order-picking/README.adoc
@@ -16,9 +16,9 @@ image::../../build/quickstarts-showcase/src/main/resources/META-INF/resources/sc
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/use-cases/order-picking
+$ cd incubator-kie-optaplanner-quickstarts/use-cases/order-picking
 ----
 
 . Start the application with Maven:
@@ -87,7 +87,7 @@ To deploy the application on OpenShift:
 . In the OpenShift web console, verify that the top left combobox is set to _Developer_ (not _Administrator_).
 . In the menu, select *Add* to create an application.
 . Under *Git Repository*, click *Import from Git* and fill in these parameters:
-.. Set *Git Repo URL* to `https://github.com/kiegroup/optaplanner-quickstarts`
+.. Set *Git Repo URL* to `https://github.com/apache/incubator-kie-optaplanner-quickstarts`
 .. Under _Show advanced Git options_, set *Context dir* to `/use-cases/order-picking`
 .. Press the *Create* button.
 . In the _Topology_ view, there is a new deployment:
diff --git a/use-cases/school-timetabling/README.adoc b/use-cases/school-timetabling/README.adoc
index d96b69849..b7df869d9 100644
--- a/use-cases/school-timetabling/README.adoc
+++ b/use-cases/school-timetabling/README.adoc
@@ -16,9 +16,9 @@ image::../../build/quickstarts-showcase/src/main/resources/META-INF/resources/sc
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/use-cases/school-timetabling
+$ cd incubator-kie-optaplanner-quickstarts/use-cases/school-timetabling
 ----
 
 . Start the application with Maven:
@@ -108,7 +108,7 @@ To deploy the application on OpenShift:
 . In the OpenShift web console, verify that the top left combobox is set to _Developer_ (not _Administrator_).
 . In the menu, select *Add* to create an application.
 . Under *Git Repository*, click *Import from Git* and fill in these parameters:
-.. Set *Git Repo URL* to `https://github.com/kiegroup/optaplanner-quickstarts`
+.. Set *Git Repo URL* to `https://github.com/apache/incubator-kie-optaplanner-quickstarts`
 .. Under _Show advanced Git options_, set *Context dir* to `/use-cases/school-timetabling`
 .. Press the *Create* button.
 . In the _Topology_ view, there is a new deployment:
diff --git a/use-cases/vaccination-scheduling/README.adoc b/use-cases/vaccination-scheduling/README.adoc
index 64fc6a429..a94d62fc6 100644
--- a/use-cases/vaccination-scheduling/README.adoc
+++ b/use-cases/vaccination-scheduling/README.adoc
@@ -16,9 +16,9 @@ image::../../build/quickstarts-showcase/src/main/resources/META-INF/resources/sc
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/use-cases/vaccination-scheduling
+$ cd incubator-kie-optaplanner-quickstarts/use-cases/vaccination-scheduling
 ----
 
 . Start the application with Maven:
@@ -87,7 +87,7 @@ To deploy the application on OpenShift:
 . In the OpenShift web console, verify that the top left combobox is set to _Developer_ (not _Administrator_).
 . In the menu, select *Add* to create an application.
 . Under *Git Repository*, click *Import from Git* and fill in these parameters:
-.. Set *Git Repo URL* to `https://github.com/kiegroup/optaplanner-quickstarts`
+.. Set *Git Repo URL* to `https://github.com/apache/incubator-kie-optaplanner-quickstarts`
 .. Under _Show advanced Git options_, set *Context dir* to `/use-cases/vaccination-scheduling`
 .. Press the *Create* button.
 . In the _Topology_ view, there is a new deployment:
diff --git a/use-cases/vehicle-routing/README.adoc b/use-cases/vehicle-routing/README.adoc
index 0b287db8f..88c68b1c3 100644
--- a/use-cases/vehicle-routing/README.adoc
+++ b/use-cases/vehicle-routing/README.adoc
@@ -16,9 +16,9 @@ image::../../build/quickstarts-showcase/src/main/resources/META-INF/resources/sc
 +
 [source, shell]
 ----
-$ git clone https://github.com/kiegroup/optaplanner-quickstarts.git
+$ git clone https://github.com/apache/incubator-kie-optaplanner-quickstarts.git
 ...
-$ cd optaplanner-quickstarts/use-cases/vehicle-routing
+$ cd incubator-kie-optaplanner-quickstarts/use-cases/vehicle-routing
 ----
 
 . Start the application with Maven:
@@ -87,7 +87,7 @@ To deploy the application on OpenShift:
 . In the OpenShift web console, verify that the top left combobox is set to _Developer_ (not _Administrator_).
 . In the menu, select *Add* to create an application.
 . Under *Git Repository*, click *Import from Git* and fill in these parameters:
-.. Set *Git Repo URL* to `https://github.com/kiegroup/optaplanner-quickstarts`
+.. Set *Git Repo URL* to `https://github.com/apache/incubator-kie-optaplanner-quickstarts`
 .. Under _Show advanced Git options_, set *Context dir* to `/use-cases/vehicle-routing`
 .. Press the *Create* button.
 . In the _Topology_ view, there is a new deployment: