diff --git a/business-central-parent/add-ons-distribution/pom.xml b/business-central-parent/add-ons-distribution/pom.xml
index c7f3fdcdad..073b9bdef5 100644
--- a/business-central-parent/add-ons-distribution/pom.xml
+++ b/business-central-parent/add-ons-distribution/pom.xml
@@ -17,7 +17,6 @@
     <properties>
         <kie-server-webc.staging.dir>${project.build.directory}/kie-server-webc.war</kie-server-webc.staging.dir>
         <kie-server-controller-webc.staging.dir>${project.build.directory}/kie-server-controller-webc.war</kie-server-controller-webc.staging.dir>
-        <optaplanner.staging.dir>${project.build.directory}/optaplanner-distribution-${version.org.kie}</optaplanner.staging.dir>
         <engine.staging.dir>${project.build.directory}/drools-engine</engine.staging.dir>
         <migration-tool.staging.dir>${project.build.directory}/migration-tool</migration-tool.staging.dir>
         <kie-server-controller-ee7.staging.dir>${project.build.directory}/kie-server-controller-ee7.war</kie-server-controller-ee7.staging.dir>
@@ -102,14 +101,6 @@
                                             <classifier>webc</classifier>
                                             <outputDirectory>${kie-server-controller-webc.staging.dir}</outputDirectory>
                                         </artifactItem>
-                                        <!-- planner engine -->
-                                        <artifactItem>
-                                            <groupId>org.optaplanner</groupId>
-                                            <artifactId>optaplanner-distribution</artifactId>
-                                            <version>${version.org.kie}</version>
-                                            <type>zip</type>
-                                            <outputDirectory>${project.build.directory}</outputDirectory>
-                                        </artifactItem>
                                         <!-- decision engine -->
                                         <artifactItem>
                                             <groupId>org.drools</groupId>
@@ -153,7 +144,6 @@
                                         <descriptor>${basedir}/src/main/assembly/kie-server-jws.zip.xml</descriptor>
                                         <descriptor>${basedir}/src/main/assembly/controller-ee7.zip.xml</descriptor>
                                         <descriptor>${basedir}/src/main/assembly/controller-jws.zip.xml</descriptor>
-                                        <descriptor>${basedir}/src/main/assembly/planner-engine.zip.xml</descriptor>
                                         <descriptor>${basedir}/src/main/assembly/decision-engine.zip.xml</descriptor>
                                         <descriptor>${basedir}/src/main/assembly/migration-tool.zip.xml</descriptor>
                                         <descriptor>${basedir}/src/main/assembly/add-ons.zip.xml</descriptor>
diff --git a/business-central-parent/add-ons-distribution/src/main/assembly/add-ons.zip.xml b/business-central-parent/add-ons-distribution/src/main/assembly/add-ons.zip.xml
index 4549ddf51c..f6b9492090 100644
--- a/business-central-parent/add-ons-distribution/src/main/assembly/add-ons.zip.xml
+++ b/business-central-parent/add-ons-distribution/src/main/assembly/add-ons.zip.xml
@@ -41,11 +41,6 @@
             <destName>add-ons-${project.version.short}-controller-jws.zip</destName>
             <fileMode>0644</fileMode>
         </file>
-        <file>
-            <source>${project.basedir}/target/add-ons-${project.version}-planner-engine.zip</source>
-            <destName>add-ons-${project.version.short}-planner-engine.zip</destName>
-            <fileMode>0644</fileMode>
-        </file>
       <file>
         <source>${project.build.directory}/add-ons-${project.version}-decision-engine.zip</source>
         <destName>add-ons-${project.version.short}-decision-engine.zip</destName>
diff --git a/business-central-parent/add-ons-distribution/src/main/assembly/planner-engine.zip.xml b/business-central-parent/add-ons-distribution/src/main/assembly/planner-engine.zip.xml
deleted file mode 100644
index 13c5281e2f..0000000000
--- a/business-central-parent/add-ons-distribution/src/main/assembly/planner-engine.zip.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
-  ~ JBoss, Home of Professional Open Source
-  ~ Copyright 2011 Red Hat Inc. and/or its affiliates and other contributors
-  ~ as indicated by the @author tags. All rights reserved.
-  ~ See the copyright.txt in the distribution for a
-  ~ full listing of individual contributors.
-  ~
-  ~ This copyrighted material is made available to anyone wishing to use,
-  ~ modify, copy, or redistribute it subject to the terms and conditions
-  ~ of the GNU Lesser General Public License, v. 2.1.
-  ~ This program is distributed in the hope that it will be useful, but WITHOUT A
-  ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  ~ PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
-  ~ You should have received a copy of the GNU Lesser General Public License,
-  ~ v.2.1 along with this distribution; if not, write to the Free Software
-  ~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-  ~ MA  02110-1301, USA.
-  -->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>planner-engine</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <baseDirectory>add-ons-${project.version.short}-planner-engine</baseDirectory>
-    <fileSets>
-       <!--Set the permission for the basedir-->
-        <fileSet>
-            <directory>${basedir}</directory>
-            <outputDirectory>/</outputDirectory>
-            <directoryMode>0755</directoryMode>
-            <excludes>
-              <exclude>**/*</exclude>
-            </excludes>
-        </fileSet>    
-        <fileSet>
-            <directory>${optaplanner.staging.dir}</directory>
-            <outputDirectory>/</outputDirectory>
-            <excludes>
-              <exclude>examples/*.sh</exclude>
-              <exclude>javadocs/**</exclude>
-              <exclude>reference_manual/**</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${optaplanner.staging.dir}</directory>
-            <outputDirectory>/</outputDirectory>
-             <includes>
-              <include>examples/*.sh</include>
-            </includes>
-            <fileMode>0755</fileMode>
-        </fileSet>
-    </fileSets>
-
-</assembly>
diff --git a/business-central-parent/business-central-webapp/pom.xml b/business-central-parent/business-central-webapp/pom.xml
index 31a3701a29..ef6f0e6fab 100644
--- a/business-central-parent/business-central-webapp/pom.xml
+++ b/business-central-parent/business-central-webapp/pom.xml
@@ -922,64 +922,6 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- Models for OptaPlanner Workbench Screens -->
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-workbench-models-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-workbench-models-datamodel-api</artifactId>
-    </dependency>
-
-    <!-- OptaPlanner Workbench Screens -->
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-wb-domain-editor-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-wb-domain-editor-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-wb-domain-editor-backend</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-wb-guided-rule-editor-backend</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-wb-guided-rule-editor-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-wb-guided-rule-editor-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-wb-solver-editor-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-wb-solver-editor-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.optaplanner</groupId>
-      <artifactId>optaplanner-wb-solver-editor-backend</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
     <!-- Errai -->
     <dependency>
       <groupId>org.jboss.errai</groupId>
@@ -2540,18 +2482,6 @@
             <compileSourcesArtifact>org.kie:kie-dmn-feel-gwt-functions</compileSourcesArtifact>
             <compileSourcesArtifact>org.kie:kie-dmn-model</compileSourcesArtifact>
 
-            <!-- Models for OptaPlanner Workbench Screens -->
-            <compileSourcesArtifact>org.optaplanner:optaplanner-workbench-models-datamodel-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.optaplanner:optaplanner-workbench-models-core</compileSourcesArtifact>
-
-            <!-- OptaPlanner WB -->
-            <compileSourcesArtifact>org.optaplanner:optaplanner-wb-domain-editor-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.optaplanner:optaplanner-wb-domain-editor-client</compileSourcesArtifact>
-            <compileSourcesArtifact>org.optaplanner:optaplanner-wb-guided-rule-editor-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.optaplanner:optaplanner-wb-guided-rule-editor-client</compileSourcesArtifact>
-            <compileSourcesArtifact>org.optaplanner:optaplanner-wb-solver-editor-api</compileSourcesArtifact>
-            <compileSourcesArtifact>org.optaplanner:optaplanner-wb-solver-editor-client</compileSourcesArtifact>
-
             <compileSourcesArtifact>org.kie.soup:kie-soup-commons</compileSourcesArtifact>
 
             <!-- UberFire -->
diff --git a/business-central-parent/business-central-webapp/src/main/resources/org/kie/bc/KIEWebapp.gwt.xml b/business-central-parent/business-central-webapp/src/main/resources/org/kie/bc/KIEWebapp.gwt.xml
index 851849c983..32d0caee4b 100644
--- a/business-central-parent/business-central-webapp/src/main/resources/org/kie/bc/KIEWebapp.gwt.xml
+++ b/business-central-parent/business-central-webapp/src/main/resources/org/kie/bc/KIEWebapp.gwt.xml
@@ -59,9 +59,9 @@
 
   <!-- Home Page - This has the same GWT Module name for Community and Product so we do not need a different module for Product -->
   <inherits name="org.kie.bc.BusinessCentralHomePage"/>
-  
+
   <!-- Profile API -->
-  <inherits name="org.kie.workbench.common.profile.ProfileAPI"/>  
+  <inherits name="org.kie.workbench.common.profile.ProfileAPI"/>
 
   <!--Common Screens -->
   <inherits name="org.kie.workbench.common.screens.explorer.KieWorkbenchProjectExplorerClient"/>
@@ -111,11 +111,6 @@
   <inherits name="org.kie.workbench.common.dmn.project.DMNProjectClient"/>
   <inherits name="org.kie.workbench.common.dmn.webapp.kogito.marshaller.DMNMarshaller"/>
 
-  <!-- Optaplanner Workbench Screens -->
-  <inherits name="org.optaplanner.workbench.screens.domaineditor.OptaPlannerWorkbenchDomainEditorClient"/>
-  <inherits name="org.optaplanner.workbench.screens.guidedrule.OptaPlannerWorkbenchGuidedRuleEditorClient"/>
-  <inherits name="org.optaplanner.workbench.screens.solver.OptaPlannerWorkbenchSolverEditorClient"/>
-
   <!-- Errai -->
   <inherits name="org.jboss.errai.ui.UI"/>
   <inherits name="org.jboss.errai.enterprise.CDI"/>
diff --git a/pom.xml b/pom.xml
index 7e2ac12a52..6c3afbf4bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,13 +102,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.optaplanner</groupId>
-        <artifactId>optaplanner-bom</artifactId>
-        <version>${version.org.kie}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>org.jbpm</groupId>
         <artifactId>jbpm-bom</artifactId>
@@ -212,7 +205,7 @@
 
       <!-- Temporary workaround for https://issues.jboss.org/browse/ERRAI-1101. Needs to stay here until
         we find a general solution (e.g. moving all localized code to Errai TranslationService. -->
-      
+
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>