diff --git a/hawkbit-ddi/hawkbit-ddi-server/pom.xml b/hawkbit-ddi/hawkbit-ddi-server/pom.xml
index c1659dc92..47da6d229 100644
--- a/hawkbit-ddi/hawkbit-ddi-server/pom.xml
+++ b/hawkbit-ddi/hawkbit-ddi-server/pom.xml
@@ -51,17 +51,6 @@
             <artifactId>mariadb-java-client</artifactId>
         </dependency>
 
-        <!-- h2 flyway is supported by the flyway-core dependency -->
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-database-postgresql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-mysql</artifactId>
-        </dependency>
-        <!-- Database END -->
-
         <!-- Test -->
         <dependency>
             <groupId>org.eclipse.hawkbit</groupId>
@@ -69,6 +58,19 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <!-- h2 flyway is supported by the flyway-core dependency -->
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-database-postgresql</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-mysql</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Database END -->
     </dependencies>
 
     <build>
diff --git a/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application.properties b/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application.properties
index d4b73703d..cafe30143 100644
--- a/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application.properties
+++ b/hawkbit-ddi/hawkbit-ddi-server/src/main/resources/application.properties
@@ -56,10 +56,6 @@ springdoc.show-login-endpoint=true
 springdoc.packages-to-scan=org.eclipse.hawkbit.ddi
 springdoc.paths-to-exclude=/system/**
 
-# Flyway disabled - US only
-spring.flyway.enabled=false
-## SQL Database Configuration - END
-
 ## No Schedulers - START
 hawkbit.autoassign.scheduler.enabled=false
 hawkbit.rollout.scheduler.enabled=false
diff --git a/hawkbit-dmf/hawkbit-dmf-server/pom.xml b/hawkbit-dmf/hawkbit-dmf-server/pom.xml
index 9c40332e5..1cab00ca4 100644
--- a/hawkbit-dmf/hawkbit-dmf-server/pom.xml
+++ b/hawkbit-dmf/hawkbit-dmf-server/pom.xml
@@ -51,17 +51,6 @@
             <artifactId>mariadb-java-client</artifactId>
         </dependency>
 
-        <!-- h2 flyway is supported by the flyway-core dependency -->
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-database-postgresql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.flywaydb</groupId>
-            <artifactId>flyway-mysql</artifactId>
-        </dependency>
-        <!-- Database END -->
-
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
diff --git a/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application.properties b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application.properties
index ea2f8b5ec..ceb47e613 100644
--- a/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application.properties
+++ b/hawkbit-dmf/hawkbit-dmf-server/src/main/resources/application.properties
@@ -35,10 +35,6 @@ spring.rabbitmq.port=5672
 spring.main.web-application-type=none
 hawkbit.server.security.dos.filter.enabled=false
 
-# Flyway disabled - US only
-spring.flyway.enabled=false
-## SQL Database Configuration - END
-
 ## No Schedulers - START
 hawkbit.autoassign.scheduler.enabled=false
 hawkbit.rollout.scheduler.enabled=false