diff --git a/build/optaplanner-build-parent/pom.xml b/build/optaplanner-build-parent/pom.xml
index 3e6db29b9f0..304a607688f 100644
--- a/build/optaplanner-build-parent/pom.xml
+++ b/build/optaplanner-build-parent/pom.xml
@@ -474,9 +474,6 @@
             <author>false</author>
             <failOnError>true</failOnError>
             <failOnWarnings>true</failOnWarnings>
-            <!-- Override JBoss parent otherwise it fails on JDK 16+ -->
-            <header combine.self="override" />
-            <footer combine.self="override" />
             <quiet>true</quiet>
             <doclint>none</doclint>
             <legacyMode>true</legacyMode>
diff --git a/optaplanner-examples/pom.xml b/optaplanner-examples/pom.xml
index e9f10d764e7..1b2eb9ab13c 100644
--- a/optaplanner-examples/pom.xml
+++ b/optaplanner-examples/pom.xml
@@ -48,8 +48,8 @@
   <repositories>
     <!-- Included so the examples sources in the distribution zip build out-of-the-box with maven -->
     <repository>
-      <id>jboss-public-repository-group</id>
-      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+      <id>apache-public-repository-group</id>
+      <url>https://repository.apache.org/content/groups/public/</url>
       <releases>
         <!-- Get releases only from Maven Central which is faster. -->
         <enabled>false</enabled>
diff --git a/pom.xml b/pom.xml
index b4a9062d11e..c40be12b467 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,21 +62,21 @@
 
   <distributionManagement>
     <repository>
-      <id>jboss-releases-repository</id>
-      <name>JBoss Releases Repository</name>
-      <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
+      <id>apache-release-staging-repository</id>
+      <name>Apache Release Staging Repository</name>
+      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
     </repository>
     <snapshotRepository>
-      <id>jboss-snapshots-repository</id>
-      <name>JBoss Snapshot Repository</name>
-      <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+      <id>apache-snapshots-repository</id>
+      <name>Apache Snapshot Repository</name>
+      <url>https://repository.apache.org/content/repositories/snapshots/</url>
     </snapshotRepository>
   </distributionManagement>
 
   <repositories>
     <repository>
-      <id>jboss-public-repository-group</id>
-      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+      <id>apache-public-repository-group</id>
+      <url>https://repository.apache.org/content/groups/public/</url>
       <releases>
         <!-- Get releases only from Maven Central which is faster. -->
         <enabled>false</enabled>
@@ -88,12 +88,12 @@
   </repositories>
   <pluginRepositories>
     <pluginRepository>
-      <id>jboss-public-repository-group</id>
-      <name>JBoss Public Repository Group</name>
-      <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+      <id>apache-public-repository-group</id>
+      <name>Apache Public Repository Group</name>
+      <url>https://repository.apache.org/content/groups/public/</url>
       <layout>default</layout>
       <releases>
-        <!-- Only get SNAPSHOTS from JBoss repository,
+        <!-- Only get SNAPSHOTS from Apache repository,
              so it tries to get releases first (and only) from Maven Central. -->
         <enabled>false</enabled>
       </releases>
@@ -105,13 +105,13 @@
   </pluginRepositories>
 
   <scm>
-    <connection>scm:git:git@github.com:kiegroup/optaplanner.git</connection>
-    <developerConnection>scm:git:git@github.com:kiegroup/optaplanner.git</developerConnection>
-    <url>https://github.com/kiegroup/optaplanner</url>
+    <connection>scm:git:git@github.com:apache/incubator-kie-optaplanner.git</connection>
+    <developerConnection>scm:git:git@github.com:apache/incubator-kie-optaplanner.git</developerConnection>
+    <url>https://github.com/apache/incubator-kie-optaplanner</url>
   </scm>
   <issueManagement>
-    <system>jira</system>
-    <url>https://issues.redhat.com/browse/PLANNER</url>
+    <system>GitHub Issues</system>
+    <url>https://github.com/apache/incubator-kie-issues/issues</url>
   </issueManagement>
   <developers>
     <developer>
@@ -126,6 +126,13 @@
     </contributor>
   </contributors>
   <mailingLists>
+    <mailingList>
+      <name>Development mailing list</name>
+      <post>dev@kie.apache.org</post>
+      <subscribe>dev-subscribe@kie.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@kie.apache.org</unsubscribe>
+      <archive>https://lists.apache.org/list.html?dev@kie.apache.org</archive>
+    </mailingList>
     <mailingList>
       <name>setup</name>
       <subscribe>https://groups.google.com/forum/#!forum/optaplanner-dev</subscribe>