diff --git a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
index 9781a04b47..3670cf3dbd 100644
--- a/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
+++ b/apps-integration-tests/integration-tests-jobs-service/integration-tests-jobs-service-common/src/main/java/org/kie/kogito/testcontainers/JobServiceContainer.java
@@ -32,6 +32,7 @@ public JobServiceContainer() {
         waitingFor(Wait.forHttp("/q/health/live").forStatusCode(200)).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
         addEnv("QUARKUS_HTTP_PORT", Integer.toString(PORT));
         addEnv("QUARKUS_LOG_CATEGORY__ORG_KIE_KOGITO_JOBS_SERVICE__LEVEL", "DEBUG");
+        addEnv("KIE_FLYWAY_ENABLED", "true");
         withAccessToHost(true);
     }
 
diff --git a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/META-INF/kie-flyway.properties b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/META-INF/kie-flyway.properties
index d29afe6d2e..846dfb4229 100644
--- a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/META-INF/kie-flyway.properties
+++ b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/META-INF/kie-flyway.properties
@@ -19,5 +19,5 @@
 
 module.name=data-audit
 
-module.locations.h2=classpath:db/data-audit/h2
-module.locations.postgresql=classpath:db/data-audit/postgresql
+module.locations.h2=classpath:kie-flyway/db/data-audit/h2
+module.locations.postgresql=classpath:kie-flyway/db/data-audit/postgresql
diff --git a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/h2/V1.0.0__CREATE DATA AUDIT SCHEMA.sql b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/h2/V1.0.0__CREATE DATA AUDIT SCHEMA.sql
similarity index 100%
rename from data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/h2/V1.0.0__CREATE DATA AUDIT SCHEMA.sql
rename to data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/h2/V1.0.0__CREATE DATA AUDIT SCHEMA.sql
diff --git a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/h2/V1.1.0__Add Query audit dynamic registering.sql b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/h2/V1.1.0__Add Query audit dynamic registering.sql
similarity index 100%
rename from data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/h2/V1.1.0__Add Query audit dynamic registering.sql
rename to data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/h2/V1.1.0__Add Query audit dynamic registering.sql
diff --git a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/h2/V1.2.0__Add migration event type.sql b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/h2/V1.2.0__Add migration event type.sql
similarity index 100%
rename from data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/h2/V1.2.0__Add migration event type.sql
rename to data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/h2/V1.2.0__Add migration event type.sql
diff --git a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql/V1.0.0__CREATE DATA AUDIT SCHEMA.sql b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql/V1.0.0__CREATE DATA AUDIT SCHEMA.sql
similarity index 100%
rename from data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql/V1.0.0__CREATE DATA AUDIT SCHEMA.sql
rename to data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql/V1.0.0__CREATE DATA AUDIT SCHEMA.sql
diff --git a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql/V1.1.0__Add Query audit dynamic registering.sql b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql/V1.1.0__Add Query audit dynamic registering.sql
similarity index 100%
rename from data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql/V1.1.0__Add Query audit dynamic registering.sql
rename to data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql/V1.1.0__Add Query audit dynamic registering.sql
diff --git a/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql/V1.2.0__Add migration event type.sql b/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql/V1.2.0__Add migration event type.sql
similarity index 100%
rename from data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql/V1.2.0__Add migration event type.sql
rename to data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql/V1.2.0__Add migration event type.sql
diff --git a/data-index/data-index-storage/data-index-storage-jpa/.gitignore b/data-index/data-index-storage/data-index-storage-jpa/.gitignore
index 86038d33d4..dcbcbd9203 100644
--- a/data-index/data-index-storage/data-index-storage-jpa/.gitignore
+++ b/data-index/data-index-storage/data-index-storage-jpa/.gitignore
@@ -1 +1 @@
-/src/main/resources/db/data-index/postgresql/*
+/src/main/resources/kie-flyway/db/data-index/postgresql/*
diff --git a/data-index/data-index-storage/data-index-storage-jpa/pom.xml b/data-index/data-index-storage/data-index-storage-jpa/pom.xml
index 0f9c7a95a7..61e0e2b61b 100644
--- a/data-index/data-index-storage/data-index-storage-jpa/pom.xml
+++ b/data-index/data-index-storage/data-index-storage-jpa/pom.xml
@@ -34,7 +34,7 @@
 
   <properties>
     <path.to.postgresql.storage>../data-index-storage-postgresql</path.to.postgresql.storage>
-    <path.to.script.folder>src/main/resources/db/</path.to.script.folder>
+    <path.to.script.folder>src/main/resources/kie-flyway/db/</path.to.script.folder>
     <path.to.migration.scripts.from>${path.to.postgresql.storage}/${path.to.script.folder}/data-index/postgresql</path.to.migration.scripts.from>
     <path.to.migration.scripts.to>${path.to.script.folder}/data-index/postgresql</path.to.migration.scripts.to>
     <java.module.name>org.kie.kogito.index.jpa</java.module.name>
diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/kie-flyway.properties b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
index 4b5645f86f..d8f805bbbf 100644
--- a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
+++ b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
@@ -19,5 +19,5 @@
 
 module.name=data-index
 
-module.locations.postgresql=classpath:db/data-index/postgresql,classpath:db/persistence-common/postgresql
-module.locations.default=classpath:db/data-index/ansi,classpath:db/persistence-common/ansi
\ No newline at end of file
+module.locations.postgresql=classpath:kie-flyway/db/data-index/postgresql,classpath:kie-flyway/db/persistence-common/postgresql
+module.locations.default=classpath:kie-flyway/db/data-index/ansi,classpath:kie-flyway/db/persistence-common/ansi
\ No newline at end of file
diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.33.0__data_index_create.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.33.0__data_index_create.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.33.0__data_index_create.sql
rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.33.0__data_index_create.sql
diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.44.0__data_index_definitions.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.44.0__data_index_definitions.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.44.0__data_index_definitions.sql
rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.44.0__data_index_definitions.sql
diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.45.0.0__data_index_node_definitions.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.0__data_index_node_definitions.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.45.0.0__data_index_node_definitions.sql
rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.0__data_index_node_definitions.sql
diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.45.0.1__add_identity_to_process_instance.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.1__add_identity_to_process_instance.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.45.0.1__add_identity_to_process_instance.sql
rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.1__add_identity_to_process_instance.sql
diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.45.0.2__data_index_definitions_add_colums.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.2__data_index_definitions_add_colums.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.45.0.2__data_index_definitions_add_colums.sql
rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.2__data_index_definitions_add_colums.sql
diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.45.0.3__add_fk_index.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.3__add_fk_index.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.45.0.3__add_fk_index.sql
rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.3__add_fk_index.sql
diff --git a/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.45.0.4__increase_varchar_length.sql b/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.4__increase_varchar_length.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi/V1.45.0.4__increase_varchar_length.sql
rename to data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi/V1.45.0.4__increase_varchar_length.sql
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
index da3a4874ea..2d8c8351cf 100644
--- a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
+++ b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/META-INF/kie-flyway.properties
@@ -19,4 +19,4 @@
 
 module.name=data-index
 
-module.locations.postgresql=classpath:db/data-index/postgresql,classpath:db/persistence-common/postgresql
\ No newline at end of file
+module.locations.postgresql=classpath:kie-flyway/db/data-index/postgresql,classpath:kie-flyway/db/persistence-common/postgresql
\ No newline at end of file
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.32.0__data_index_create.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.32.0__data_index_create.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.32.0__data_index_create.sql
rename to data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.32.0__data_index_create.sql
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.44.0__data_index_definitions.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.44.0__data_index_definitions.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.44.0__data_index_definitions.sql
rename to data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.44.0__data_index_definitions.sql
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.45.0.0__data_index_node_definitions.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.0__data_index_node_definitions.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.45.0.0__data_index_node_definitions.sql
rename to data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.0__data_index_node_definitions.sql
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.45.0.1__add_identity_to_process_instance.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.1__add_identity_to_process_instance.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.45.0.1__add_identity_to_process_instance.sql
rename to data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.1__add_identity_to_process_instance.sql
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.45.0.2__data_index_definitions_add_columns.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.2__data_index_definitions_add_columns.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.45.0.2__data_index_definitions_add_columns.sql
rename to data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.2__data_index_definitions_add_columns.sql
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.45.0.3__add_fk_index.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.3__add_fk_index.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.45.0.3__add_fk_index.sql
rename to data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.3__add_fk_index.sql
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.45.0.4__increase_varchar_length.sql b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.4__increase_varchar_length.sql
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/V1.45.0.4__increase_varchar_length.sql
rename to data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/V1.45.0.4__increase_varchar_length.sql
diff --git a/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/readme.txt b/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/readme.txt
similarity index 100%
rename from data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql/readme.txt
rename to data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql/readme.txt
diff --git a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexPostgreSqlContainer.java b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexPostgreSqlContainer.java
index c02aca8414..dfd266ca06 100644
--- a/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexPostgreSqlContainer.java
+++ b/data-index/data-index-test-utils/src/main/java/org/kie/kogito/index/test/containers/DataIndexPostgreSqlContainer.java
@@ -35,9 +35,7 @@ public void setPostgreSqlURL(String postgreSqlURL, String username, String passw
     }
 
     public void migrateDB() {
-        addEnv("QUARKUS_FLYWAY_MIGRATE_AT_START", "true");
-        addEnv("QUARKUS_FLYWAY_BASELINE_ON_MIGRATE", "true");
-        addEnv("QUARKUS_FLYWAY_TABLE", "data-index-flyway");
+        addEnv("KIE_FLYWAY_ENABLED", "true");
     }
 
     @Override
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/META-INF/kie-flyway.properties b/jobs-service/jobs-service-postgresql-common/src/main/resources/META-INF/kie-flyway.properties
index 3158010733..09510ff4ff 100644
--- a/jobs-service/jobs-service-postgresql-common/src/main/resources/META-INF/kie-flyway.properties
+++ b/jobs-service/jobs-service-postgresql-common/src/main/resources/META-INF/kie-flyway.properties
@@ -19,4 +19,4 @@
 
 module.name=jobs-service
 
-module.locations.postgresql=classpath:db/jobs-service/postgresql
\ No newline at end of file
+module.locations.postgresql=classpath:kie-flyway/db/jobs-service/postgresql
\ No newline at end of file
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V2.0.0__Create_Table.sql b/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V2.0.0__Create_Table.sql
similarity index 100%
rename from jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V2.0.0__Create_Table.sql
rename to jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V2.0.0__Create_Table.sql
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V2.0.1__job_details_increase_job_id_size.sql b/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V2.0.1__job_details_increase_job_id_size.sql
similarity index 100%
rename from jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V2.0.1__job_details_increase_job_id_size.sql
rename to jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V2.0.1__job_details_increase_job_id_size.sql
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V2.0.2__job_details_add_fire_time_col.sql b/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V2.0.2__job_details_add_fire_time_col.sql
similarity index 100%
rename from jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V2.0.2__job_details_add_fire_time_col.sql
rename to jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V2.0.2__job_details_add_fire_time_col.sql
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V2.0.3__Create_Table_Management.sql b/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V2.0.3__Create_Table_Management.sql
similarity index 100%
rename from jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V2.0.3__Create_Table_Management.sql
rename to jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V2.0.3__Create_Table_Management.sql
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V3.0.0__Create_Jobs_Table_V2.sql b/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V3.0.0__Create_Jobs_Table_V2.sql
similarity index 100%
rename from jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V3.0.0__Create_Jobs_Table_V2.sql
rename to jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V3.0.0__Create_Jobs_Table_V2.sql
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql b/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql
similarity index 100%
rename from jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql
rename to jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V3.0.1__Migrate_Jobs_v1_to_v2_Table.sql
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V3.0.2__Add_Execution_Timeout_Col.sql b/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V3.0.2__Add_Execution_Timeout_Col.sql
similarity index 100%
rename from jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V3.0.2__Add_Execution_Timeout_Col.sql
rename to jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V3.0.2__Add_Execution_Timeout_Col.sql
diff --git a/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V3.0.3__Add_Created_Col.sql b/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V3.0.3__Add_Created_Col.sql
similarity index 100%
rename from jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql/V3.0.3__Add_Created_Col.sql
rename to jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql/V3.0.3__Add_Created_Col.sql
diff --git a/jobs-service/jobs-service-storage-jpa/.gitignore b/jobs-service/jobs-service-storage-jpa/.gitignore
index 923977b8ea..2df81122b4 100644
--- a/jobs-service/jobs-service-storage-jpa/.gitignore
+++ b/jobs-service/jobs-service-storage-jpa/.gitignore
@@ -1 +1 @@
-/src/main/resources/db/jobs-service/postgresql/*
+/src/main/resources/kie-flyway/db/jobs-service/postgresql/*
diff --git a/jobs-service/jobs-service-storage-jpa/src/main/resources/META-INF/kie-flyway.properties b/jobs-service/jobs-service-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
index ac732b4a7d..985651de55 100644
--- a/jobs-service/jobs-service-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
+++ b/jobs-service/jobs-service-storage-jpa/src/main/resources/META-INF/kie-flyway.properties
@@ -19,5 +19,5 @@
 
 module.name=jobs-service
 
-module.locations.postgresql=classpath:db/jobs-service/postgresql
-module.locations.default=classpath:db/jobs-service/ansi
\ No newline at end of file
+module.locations.postgresql=classpath:kie-flyway/db/jobs-service/postgresql
+module.locations.default=classpath:kie-flyway/db/jobs-service/ansi
\ No newline at end of file
diff --git a/jobs-service/jobs-service-storage-jpa/src/main/resources/db/jobs-service/ansi/V2.0.0__Create_Tables.sql b/jobs-service/jobs-service-storage-jpa/src/main/resources/kie-flyway/db/jobs-service/ansi/V2.0.0__Create_Tables.sql
similarity index 100%
rename from jobs-service/jobs-service-storage-jpa/src/main/resources/db/jobs-service/ansi/V2.0.0__Create_Tables.sql
rename to jobs-service/jobs-service-storage-jpa/src/main/resources/kie-flyway/db/jobs-service/ansi/V2.0.0__Create_Tables.sql
diff --git a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
index 7d51ac69c1..9bb6d445ce 100644
--- a/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
+++ b/persistence-commons/kogito-ddl/src/assembly/multi-repo-zip.xml
@@ -38,14 +38,14 @@
     <fileSets>
         <!-- Persistence Commons -->
         <fileSet>
-            <directory>${project.root.dir}/persistence-commons/persistence-commons-jpa/src/main/resources/db/persistence-commons/ansi</directory>
+            <directory>${project.root.dir}/persistence-commons/persistence-commons-jpa/src/main/resources/kie-flyway/db/persistence-commons/ansi</directory>
             <outputDirectory>h2/persistence-commons</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.root.dir}/persistence-commons/persistence-commons-postgresql/src/main/resources/db/persistence-commons/postgresql</directory>
+            <directory>${project.root.dir}/persistence-commons/persistence-commons-postgresql/src/main/resources/kie-flyway/db/persistence-commons/postgresql</directory>
             <outputDirectory>postgresql/persistence-commons</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -54,14 +54,14 @@
 
         <!-- Data Index -->
         <fileSet>
-            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/db/data-index/ansi</directory>
+            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-jpa/src/main/resources/kie-flyway/db/data-index/ansi</directory>
             <outputDirectory>h2/data-index</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql</directory>
+            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql</directory>
             <outputDirectory>postgresql/data-index</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -70,14 +70,14 @@
 
         <!-- Data Audit -->
         <fileSet>
-            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/h2</directory>
+            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/h2</directory>
             <outputDirectory>h2/data-audit</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql</directory>
+            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql</directory>
             <outputDirectory>postgresql/data-audit</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -86,14 +86,14 @@
 
         <!-- Job Service -->
         <fileSet>
-            <directory>${project.root.dir}/jobs-service/jobs-service-storage-jpa/src/main/resources/db/jobs-service/ansi</directory>
+            <directory>${project.root.dir}/jobs-service/jobs-service-storage-jpa/src/main/resources/kie-flyway/db/jobs-service/ansi</directory>
             <outputDirectory>h2/jobs-service</outputDirectory>
             <includes>
                 <include>*.sql</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql</directory>
+            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql</directory>
             <outputDirectory>postgresql/jobs-service</outputDirectory>
             <includes>
                 <include>*.sql</include>
diff --git a/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml b/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml
index 292da5623f..4a590072c8 100644
--- a/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml
+++ b/persistence-commons/kogito-ddl/src/assembly/productized-multi-repo-zip.xml
@@ -38,7 +38,7 @@
     <fileSets>
         <!-- Persistence Commons -->
         <fileSet>
-            <directory>${project.root.dir}/persistence-commons/persistence-commons-postgresql/src/main/resources/db/persistence-commons/postgresql</directory>
+            <directory>${project.root.dir}/persistence-commons/persistence-commons-postgresql/src/main/resources/kie-flyway/db/persistence-commons/postgresql</directory>
             <outputDirectory>postgresql/persistence-commons</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -47,7 +47,7 @@
 
         <!-- Data Index -->
         <fileSet>
-            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/db/data-index/postgresql</directory>
+            <directory>${project.root.dir}/data-index/data-index-storage/data-index-storage-postgresql/src/main/resources/kie-flyway/db/data-index/postgresql</directory>
             <outputDirectory>postgresql/data-index</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -56,7 +56,7 @@
 
         <!-- Data Audit -->
         <fileSet>
-            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/db/data-audit/postgresql</directory>
+            <directory>${project.root.dir}/data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql</directory>
             <outputDirectory>postgresql/data-audit</outputDirectory>
             <includes>
                 <include>*.sql</include>
@@ -65,7 +65,7 @@
 
         <!-- Job Service -->
         <fileSet>
-            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/db/jobs-service/postgresql</directory>
+            <directory>${project.root.dir}/jobs-service/jobs-service-postgresql-common/src/main/resources/kie-flyway/db/jobs-service/postgresql</directory>
             <outputDirectory>postgresql/jobs-service</outputDirectory>
             <includes>
                 <include>*.sql</include>
diff --git a/persistence-commons/persistence-commons-jpa/.gitignore b/persistence-commons/persistence-commons-jpa/.gitignore
index c2c23d3d39..398874aed7 100644
--- a/persistence-commons/persistence-commons-jpa/.gitignore
+++ b/persistence-commons/persistence-commons-jpa/.gitignore
@@ -1 +1 @@
-/src/main/resources/db/persistence-commons/postgresql/*
\ No newline at end of file
+/src/main/resources/kie-flyway/db/persistence-commons/postgresql/*
\ No newline at end of file
diff --git a/persistence-commons/persistence-commons-jpa/pom.xml b/persistence-commons/persistence-commons-jpa/pom.xml
index 857cebc956..55a1c1ace2 100644
--- a/persistence-commons/persistence-commons-jpa/pom.xml
+++ b/persistence-commons/persistence-commons-jpa/pom.xml
@@ -34,7 +34,7 @@
 
   <properties>
     <path.to.postgresql.storage>../persistence-commons-postgresql</path.to.postgresql.storage>
-    <path.to.script.folder>src/main/resources/db/</path.to.script.folder>
+    <path.to.script.folder>src/main/resources/kie-flyway/db/</path.to.script.folder>
     <path.to.migration.scripts.from>${path.to.postgresql.storage}/${path.to.script.folder}/persistence-commons/postgresql</path.to.migration.scripts.from>
     <path.to.migration.scripts.to>${path.to.script.folder}/persistence-commons/postgresql</path.to.migration.scripts.to>
     <java.module.name>org.kie.kogito.persistence.jpa</java.module.name>
diff --git a/persistence-commons/persistence-commons-jpa/src/main/resources/db/persistence-commons/ansi/V1.5.0__kogito_apps_create_kogito_data_cache.sql b/persistence-commons/persistence-commons-jpa/src/main/resources/kie-flyway/db/persistence-commons/ansi/V1.5.0__kogito_apps_create_kogito_data_cache.sql
similarity index 100%
rename from persistence-commons/persistence-commons-jpa/src/main/resources/db/persistence-commons/ansi/V1.5.0__kogito_apps_create_kogito_data_cache.sql
rename to persistence-commons/persistence-commons-jpa/src/main/resources/kie-flyway/db/persistence-commons/ansi/V1.5.0__kogito_apps_create_kogito_data_cache.sql
diff --git a/persistence-commons/persistence-commons-postgresql/src/main/resources/db/persistence-commons/postgresql/V1.5.0__kogito_apps_create_kogito_data_cache.sql b/persistence-commons/persistence-commons-postgresql/src/main/resources/kie-flyway/db/persistence-commons/postgresql/V1.5.0__kogito_apps_create_kogito_data_cache.sql
similarity index 100%
rename from persistence-commons/persistence-commons-postgresql/src/main/resources/db/persistence-commons/postgresql/V1.5.0__kogito_apps_create_kogito_data_cache.sql
rename to persistence-commons/persistence-commons-postgresql/src/main/resources/kie-flyway/db/persistence-commons/postgresql/V1.5.0__kogito_apps_create_kogito_data_cache.sql