diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 918865bec86..70e7781f58f 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -81,7 +81,7 @@ dependencyManagement {
      dependency 'com.lowagie:itext:2.1.7'
      dependency 'com.lowagie:itext-rtf:2.1.7'
      dependency 'org.mnode.ical4j:ical4j:1.0.4'
-     dependency 'com.googlecode.flyway:flyway-core:2.1.1'
+     dependency 'org.flywaydb:flyway-core:+'
      dependency 'org.quartz-scheduler:quartz:+'
      dependency 'com.amazonaws:aws-java-sdk-s3:1.11.80'
      dependency 'net.sf.ehcache:ehcache:+'
diff --git a/fineract-provider/dependencies.gradle b/fineract-provider/dependencies.gradle
index dd252cdbb49..37eb5a88414 100644
--- a/fineract-provider/dependencies.gradle
+++ b/fineract-provider/dependencies.gradle
@@ -86,7 +86,7 @@ dependencies {
             'com.lowagie:itext',
             //'com.lowagie:itext-rtf',
 
-            'com.googlecode.flyway:flyway-core',
+            'org.flywaydb:flyway-core',
 
             'com.amazonaws:aws-java-sdk-s3',
             'net.sf.ehcache:ehcache',
diff --git a/fineract-provider/dev-dependencies.gradle b/fineract-provider/dev-dependencies.gradle
index 70b26f69e59..0bec68d478d 100644
--- a/fineract-provider/dev-dependencies.gradle
+++ b/fineract-provider/dev-dependencies.gradle
@@ -87,7 +87,7 @@ dependencies {
             'com.lowagie:itext',
             'com.lowagie:itext-rtf',
 
-            'com.googlecode.flyway:flyway-core',
+            'org.flywaydb:flyway-core',
 
             'com.amazonaws:aws-java-sdk-s3',
             'net.sf.ehcache:ehcache',
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
index 0a1c91b8c1b..7bb444685d4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
@@ -34,9 +34,9 @@
 
 import com.google.common.collect.ImmutableMap;
 
-import com.googlecode.flyway.core.Flyway;
-import com.googlecode.flyway.core.api.FlywayException;
-import com.googlecode.flyway.core.util.jdbc.DriverDataSource;
+import org.flywaydb.core.Flyway;
+import org.flywaydb.core.api.FlywayException;
+import org.flywaydb.core.internal.jdbc.DriverDataSource;
 
 /**
  * A service that picks up on tenants that are configured to auto-update their
@@ -66,12 +66,18 @@ public void upgradeAllTenants() {
         for (final FineractPlatformTenant tenant : tenants) {
             final FineractPlatformTenantConnection connection = tenant.getConnection();
             if (connection.isAutoUpdateEnabled()) {
-                final Flyway flyway = new Flyway();
-                String connectionProtocol = driverConfig.constructProtocol(connection.getSchemaServer(), connection.getSchemaServerPort(), connection.getSchemaName()) ;
-                DriverDataSource source = new DriverDataSource(driverConfig.getDriverClassName(), connectionProtocol, connection.getSchemaUsername(), connection.getSchemaPassword()) ;
-                flyway.setDataSource(source);
-                flyway.setLocations("sql/migrations/core_db");
-                flyway.setOutOfOrder(true);
+                String connectionProtocol = driverConfig.constructProtocol(connection.getSchemaServer(), connection.getSchemaServerPort(), connection.getSchemaName());
+                final Flyway flyway = Flyway
+                        .configure()
+                        .dataSource(connectionProtocol, connection.getSchemaUsername(), connection.getSchemaPassword())
+                        .locations("sql/migrations/core_db")
+                        .outOfOrder(true)
+                        .load();
+
+//                DriverDataSource source = new DriverDataSource(driverConfig.getDriverClassName(), connectionProtocol, connection.getSchemaUsername(), connection.getSchemaPassword()) ;
+//                flyway.setDataSource(source);
+//                flyway.setLocations("sql/migrations/core_db");
+//                flyway.setOutOfOrder(true);
                 try {
                     flyway.migrate();
                 } catch (FlywayException e) {
@@ -88,13 +94,21 @@ public void upgradeAllTenants() {
      * itself.
      */
     private void upgradeTenantDB() {
-        final Flyway flyway = new Flyway();
-        flyway.setDataSource(tenantDataSource);
-        flyway.setLocations("sql/migrations/list_db");
-        flyway.setOutOfOrder(true);
-        flyway.setPlaceholders(ImmutableMap.of( // FINERACT-773
-            "fineract_default_tenantdb_hostname", System.getProperty("FINERACT_DEFAULT_TENANTDB_HOSTNAME", "localhost"),
-            "fineract_default_tenantdb_port",     System.getProperty("FINERACT_DEFAULT_TENANTDB_PORT", "3306")));
+        final Flyway flyway = Flyway
+                .configure()
+                .dataSource(tenantDataSource)
+                .locations("sql/migrations/list_db")
+                .outOfOrder(true)
+                .placeholders(ImmutableMap.of( // FINERACT-773
+                    "fineract_default_tenantdb_hostname", System.getProperty("FINERACT_DEFAULT_TENANTDB_HOSTNAME", "localhost"),
+                    "fineract_default_tenantdb_port",     System.getProperty("FINERACT_DEFAULT_TENANTDB_PORT", "3306")))
+                .load();
+//        flyway.setDataSource(tenantDataSource);
+//        flyway.setLocations("sql/migrations/list_db");
+//        flyway.setOutOfOrder(true);
+//        flyway.setPlaceholders(ImmutableMap.of( // FINERACT-773
+//            "fineract_default_tenantdb_hostname", System.getProperty("FINERACT_DEFAULT_TENANTDB_HOSTNAME", "localhost"),
+//            "fineract_default_tenantdb_port",     System.getProperty("FINERACT_DEFAULT_TENANTDB_PORT", "3306")));
         flyway.migrate();
 
         tenantDataSourcePortFixService.fixUpTenantsSchemaServerPort();