diff --git a/lib/db/db-pool.js b/lib/db/db-pool.js
index 086e44e6fd..9ecea4f695 100644
--- a/lib/db/db-pool.js
+++ b/lib/db/db-pool.js
@@ -2,12 +2,12 @@
 
 const knex   = require('knex');
 
-module.exports.createDb = function (databaseConnection, schema = 'public') {
+module.exports.createDb = function ({ databaseUri, poolMin = 2, poolMax = 20, databaseSchema = 'public' }) {
     const db = knex({
         client: 'pg',
-        connection: databaseConnection,
-        pool: { min: 2, max: 20 },
-        searchPath: schema,
+        connection: databaseUri,
+        pool: { min: poolMin, max: poolMax },
+        searchPath: databaseSchema,
     });
 
     return db;
diff --git a/lib/db/index.js b/lib/db/index.js
index 58ca375b22..19af24c75b 100644
--- a/lib/db/index.js
+++ b/lib/db/index.js
@@ -9,7 +9,7 @@ const ClientMetricsStore = require('./client-metrics-store');
 const ClientStrategyStore = require('./client-strategy-store');
 
 module.exports.createStores = (config) => {
-    const db = createDb(config.databaseUri, config.databaseSchema);
+    const db = createDb(config);
     const eventStore = new EventStore(db);
 
     return {
diff --git a/migrator.js b/migrator.js
index b22b517969..39aeecc9c5 100644
--- a/migrator.js
+++ b/migrator.js
@@ -1,13 +1,12 @@
 'use strict';
 
-const DBMigrate = require('db-migrate');
-const path = require('path');
+const { getInstance } = require('db-migrate');
 const parseDbUrl = require('parse-database-url');
 
-function migrateDb (dbUrl, schema = "public") {
-    const custom = parseDbUrl(dbUrl);
-    custom.schema = schema;
-    const dbmigrate = DBMigrate.getInstance(true, {
+function migrateDb ({ databaseUri, databaseSchema = 'public' }) {
+    const custom = parseDbUrl(databaseUri);
+    custom.schema = databaseSchema;
+    const dbmigrate = getInstance(true, {
         cwd: __dirname,
         config: { custom },
         env: 'custom' }
@@ -15,4 +14,4 @@ function migrateDb (dbUrl, schema = "public") {
     return dbmigrate.up();
 }
 
-module.exports = migrateDb;
\ No newline at end of file
+module.exports = migrateDb;