diff --git a/pom.xml b/pom.xml
index 0b07cc732..ca50c647b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -558,6 +558,14 @@
       <artifactId>translate</artifactId>
       <version>2.40.15</version>
     </dependency>
+    <dependency>
+      <groupId>org.flywaydb</groupId>
+      <artifactId>flyway-core</artifactId>
+    </dependency> 
+    <dependency>
+      <groupId>org.flywaydb</groupId>
+      <artifactId>flyway-mysql</artifactId>
+    </dependency>
   </dependencies>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/resources/application-dockerdev-sample.properties b/src/main/resources/application-dockerdev-sample.properties
index 5138c09bd..86f9eca42 100644
--- a/src/main/resources/application-dockerdev-sample.properties
+++ b/src/main/resources/application-dockerdev-sample.properties
@@ -17,6 +17,8 @@ server.tomcat.max-http-form-post-size=100MB
 spring.servlet.multipart.max-file-size=100MB
 spring.servlet.multipart.max-request-size=100MB
 
+spring.devtools.restart.exclude=db/migration/**
+
 ########## WISE Properties ##########
 
 # This section is for portal definitions
@@ -97,6 +99,8 @@ spring.redis.pool.max.total=128
 #spring.session.redis.flush-mode=on-save # Sessions flush mode.
 #spring.session.redis.namespace=spring:session # Namespace for keys used to store sessions.
 
+spring.flyway.baseline-on-migrate=true
+
 ######### sendmail properties ##########
 
 # This section defines the settings that the portal will use to send mail.
diff --git a/src/main/resources/application_sample.properties b/src/main/resources/application_sample.properties
index 9c9e4666d..376519772 100644
--- a/src/main/resources/application_sample.properties
+++ b/src/main/resources/application_sample.properties
@@ -97,6 +97,8 @@ spring.redis.pool.max.total=128
 #spring.session.redis.flush-mode=on-save # Sessions flush mode.
 #spring.session.redis.namespace=spring:session # Namespace for keys used to store sessions.
 
+spring.flyway.baseline-on-migrate=true
+
 ######### sendmail properties ##########
 
 # This section defines the settings that the portal will use to send mail.
diff --git a/src/main/resources/wise_db_init.sql b/src/main/resources/db/migration/V1__init_schema.sql
similarity index 100%
rename from src/main/resources/wise_db_init.sql
rename to src/main/resources/db/migration/V1__init_schema.sql
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 8a64760ad..2bff59351 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -95,6 +95,8 @@ spring.redis.pool.max.total=128
 #spring.session.redis.flush-mode=on-save # Sessions flush mode.
 #spring.session.redis.namespace=spring:session # Namespace for keys used to store sessions.
 
+spring.flyway.enabled=false
+
 ######### sendmail properties ##########
 
 # This section defines the settings that the portal will use to send mail.