diff --git a/addons/common/persistence/postgresql/.gitignore b/addons/common/persistence/postgresql/.gitignore
deleted file mode 100644
index 423a2b902f1..00000000000
--- a/addons/common/persistence/postgresql/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-###
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-###
-
-/src/main/resources/kie-flyway/db/persistence-postgresql/postgresql/*
\ No newline at end of file
diff --git a/addons/common/persistence/postgresql/pom.xml b/addons/common/persistence/postgresql/pom.xml
index 581d6edf9f2..4b3048dbdba 100644
--- a/addons/common/persistence/postgresql/pom.xml
+++ b/addons/common/persistence/postgresql/pom.xml
@@ -1,4 +1,4 @@
- <!--
+<!--
 
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ -31,9 +31,10 @@
   <description>PostgreSQL based persistence for KIE</description>
   <properties>
     <path.to.jdbc.addon>../jdbc</path.to.jdbc.addon>
-    <path.to.script.folder>src/main/resources/kie-flyway/db/</path.to.script.folder>
-    <path.to.migration.scripts.from>${path.to.jdbc.addon}/${path.to.script.folder}/persistence-jdbc/postgresql</path.to.migration.scripts.from>
-    <path.to.migration.scripts.to>${path.to.script.folder}/persistence-postgresql/postgresql</path.to.migration.scripts.to>
+    <path.to.flyway.location>kie-flyway/db</path.to.flyway.location>
+    <path.to.script.folder>src/main/resources/${path.to.flyway.location}/persistence-jdbc/postgresql</path.to.script.folder>
+    <path.to.migration.scripts.source>${path.to.jdbc.addon}/${path.to.script.folder}</path.to.migration.scripts.source>
+    <path.to.migration.scripts.target>target/classes/${path.to.flyway.location}/persistence-postgresql/postgresql</path.to.migration.scripts.target>
     <java.module.name>org.kie.kogito.persistence.postgresql</java.module.name>
   </properties>
 
@@ -117,17 +118,7 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${path.to.script.folder}</directory>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-<!--  The cleanest way would be to use the maven-dependency-plugin to unpack and copy scripts from the built artifact `kie-addons-persistence-jdbc` but there's a limitation to using this only in the `package` phase whereas we need that into the `generate-sources` phase. See also https://issues.apache.org/jira/browse/MDEP-98 -->
+      <!--  The cleanest way would be to use the maven-dependency-plugin to unpack and copy scripts from the built artifact `kie-addons-persistence-jdbc` but there's a limitation to using this only in the `package` phase whereas we need that into the `generate-sources` phase. See also https://issues.apache.org/jira/browse/MDEP-98 -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
@@ -139,10 +130,10 @@
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${path.to.migration.scripts.to}</outputDirectory>
+              <outputDirectory>${path.to.migration.scripts.target}</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${path.to.migration.scripts.from}</directory>
+                  <directory>${path.to.migration.scripts.source}</directory>
                 </resource>
               </resources>
             </configuration>
diff --git a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionCodegen.java b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionCodegen.java
index 757bd5caf04..de95c7c77e2 100644
--- a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionCodegen.java
+++ b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionCodegen.java
@@ -73,7 +73,7 @@ public class DecisionCodegen extends AbstractGenerator {
     public static final String GENERATOR_NAME = "decisions";
 
     /**
-     *  (boolean) generate java classes to support strongly typed input (default false)
+     * (boolean) generate java classes to support strongly typed input (default false)
      */
     public static String STRONGLY_TYPED_CONFIGURATION_KEY = "kogito.decisions.stronglytyped";
     /**
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessCodegen.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessCodegen.java
index c360ec5e8c2..71debb2806b 100644
--- a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessCodegen.java
+++ b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/process/ProcessCodegen.java
@@ -356,17 +356,17 @@ protected Collection<GeneratedFile> internalGenerate() {
             //Creating and adding the ResourceGenerator for REST generation
             if (context().hasRest()) {
                 ProcessResourceGenerator processResourceGenerator = new ProcessResourceGenerator(
-                    context(),
-                    workFlowProcess,
-                    modelClassGenerator.className(),
-                    execModelGen.className(),
-                    applicationCanonicalName());
+                        context(),
+                        workFlowProcess,
+                        modelClassGenerator.className(),
+                        execModelGen.className(),
+                        applicationCanonicalName());
 
                 processResourceGenerator
-                    .withUserTasks(processIdToUserTaskModel.get(workFlowProcess.getId()))
-                    .withSignals(metaData.getSignals())
-                    .withTriggers(metaData.isStartable(), metaData.isDynamic(), metaData.getTriggers())
-                    .withTransaction(isTransactionEnabled());
+                        .withUserTasks(processIdToUserTaskModel.get(workFlowProcess.getId()))
+                        .withSignals(metaData.getSignals())
+                        .withTriggers(metaData.isStartable(), metaData.isDynamic(), metaData.getTriggers())
+                        .withTransaction(isTransactionEnabled());
 
                 rgs.add(processResourceGenerator);
             }