diff --git a/compose/app.go b/compose/app.go
index e01bf2c98..cc0e16b1e 100644
--- a/compose/app.go
+++ b/compose/app.go
@@ -49,7 +49,7 @@ func (app *App) Setup(log *zap.Logger, opts *app.Options) (err error) {
 }
 
 func (app *App) Upgrade(ctx context.Context) (err error) {
-	db := factory.Database.MustGet(SERVICE, "default").With(ctx).Quiet()
+	db := factory.Database.MustGet().With(ctx).Quiet()
 	err = migrate.Migrate(db, app.Log)
 	if err != nil {
 		return
diff --git a/compose/repository/repository.go b/compose/repository/repository.go
index 306cb1edb..dd31fd889 100644
--- a/compose/repository/repository.go
+++ b/compose/repository/repository.go
@@ -15,7 +15,7 @@ type (
 
 // DB produces a contextual DB handle
 func DB(ctx context.Context) *factory.DB {
-	return factory.Database.MustGet("compose", "default").With(ctx)
+	return factory.Database.MustGet().With(ctx)
 }
 
 // With updates repository and database contexts
diff --git a/messaging/app.go b/messaging/app.go
index b5acd502d..b7beb05dc 100644
--- a/messaging/app.go
+++ b/messaging/app.go
@@ -55,7 +55,7 @@ func (app *App) Setup(log *zap.Logger, opts *app.Options) (err error) {
 }
 
 func (app *App) Upgrade(ctx context.Context) (err error) {
-	db := factory.Database.MustGet(SERVICE, "default").With(ctx).Quiet()
+	db := factory.Database.MustGet().With(ctx).Quiet()
 	err = migrate.Migrate(db, app.Log)
 	if err != nil {
 		return
diff --git a/messaging/repository/repository.go b/messaging/repository/repository.go
index 31283089f..dd31fd889 100644
--- a/messaging/repository/repository.go
+++ b/messaging/repository/repository.go
@@ -15,7 +15,7 @@ type (
 
 // DB produces a contextual DB handle
 func DB(ctx context.Context) *factory.DB {
-	return factory.Database.MustGet("messaging", "default").With(ctx)
+	return factory.Database.MustGet().With(ctx)
 }
 
 // With updates repository and database contexts
diff --git a/pkg/automation/command.go b/pkg/automation/command.go
index d40fce20b..b011fb89b 100644
--- a/pkg/automation/command.go
+++ b/pkg/automation/command.go
@@ -191,7 +191,7 @@ func ScriptExporter(subsys string) *cobra.Command {
 
 				ctx = cli.Context()
 
-				db = factory.Database.MustGet(subsys, "default").With(ctx) //.Quiet()
+				db = factory.Database.MustGet().With(ctx) //.Quiet()
 
 				// Skip deleted, scripts, ones named test and those with empty source
 				scriptQuery = squirrel.
diff --git a/pkg/db/connector.go b/pkg/db/connector.go
index 282c168b4..0c094ce70 100644
--- a/pkg/db/connector.go
+++ b/pkg/db/connector.go
@@ -25,7 +25,8 @@ func TryToConnect(ctx context.Context, log *zap.Logger, opt options.DBOpt) (db *
 	}
 
 	name := "default"
-	factory.Database.Add(name, opt.DSN)
+
+	factory.Database.Add(name, factory.DatabaseCredential{DSN: opt.DSN, DriverName: "mysql"})
 
 	var (
 		connErrCh = make(chan error, 1)
diff --git a/system/app.go b/system/app.go
index 9fe950013..7ba4fd77a 100644
--- a/system/app.go
+++ b/system/app.go
@@ -50,7 +50,7 @@ func (app *App) Setup(log *zap.Logger, opts *app.Options) (err error) {
 }
 
 func (app *App) Upgrade(ctx context.Context) (err error) {
-	db := factory.Database.MustGet(SERVICE, "default").With(ctx).Quiet()
+	db := factory.Database.MustGet().With(ctx).Quiet()
 	err = migrate.Migrate(db, app.Log)
 	if err != nil {
 		return
diff --git a/system/commands/auth.go b/system/commands/auth.go
index 75639c978..eac2ca9ec 100644
--- a/system/commands/auth.go
+++ b/system/commands/auth.go
@@ -74,7 +74,7 @@ func Auth() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			var (
 				ctx = auth.SetSuperUserContext(cli.Context())
-				db  = factory.Database.MustGet("system", "default")
+				db  = factory.Database.MustGet()
 
 				userRepo = repository.User(ctx, db)
 				roleRepo = repository.Role(ctx, db)
diff --git a/system/commands/roles.go b/system/commands/roles.go
index 251ca0cde..70c7a6a93 100644
--- a/system/commands/roles.go
+++ b/system/commands/roles.go
@@ -27,7 +27,7 @@ func Roles() *cobra.Command {
 			// Create role and user repository.
 			var (
 				ctx = auth.SetSuperUserContext(cli.Context())
-				db  = factory.Database.MustGet("system", "default")
+				db  = factory.Database.MustGet()
 
 				roleStr, userStr = args[0], args[1]
 
diff --git a/system/commands/users.go b/system/commands/users.go
index 9dc70a59c..ba0d3db1b 100644
--- a/system/commands/users.go
+++ b/system/commands/users.go
@@ -35,7 +35,7 @@ func Users() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			var (
 				ctx = auth.SetSuperUserContext(cli.Context())
-				db  = factory.Database.MustGet("system", "default")
+				db  = factory.Database.MustGet()
 
 				queryFlag = cmd.Flags().Lookup("query").Value.String()
 				limitFlag = cmd.Flags().Lookup("limit").Value.String()
@@ -95,7 +95,7 @@ func Users() *cobra.Command {
 			var (
 				ctx = auth.SetSuperUserContext(cli.Context())
 
-				db = factory.Database.MustGet("system", "default")
+				db = factory.Database.MustGet()
 
 				userRepo = repository.User(ctx, db)
 				authSvc  = service.Auth(ctx)
@@ -152,7 +152,7 @@ func Users() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			var (
 				ctx = auth.SetSuperUserContext(cli.Context())
-				db  = factory.Database.MustGet("system", "default")
+				db  = factory.Database.MustGet()
 
 				userRepo = repository.User(ctx, db)
 				authSvc  = service.Auth(ctx)
diff --git a/system/provision.go b/system/provision.go
index 53938c693..0f5290d82 100644
--- a/system/provision.go
+++ b/system/provision.go
@@ -57,7 +57,7 @@ func isProvisioned(ctx context.Context) (bool, error) {
 }
 
 func makeDefaultApplications(ctx context.Context, log *zap.Logger) error {
-	db := factory.Database.MustGet("system", "default")
+	db := factory.Database.MustGet()
 
 	repo := repository.Application(ctx, db)
 
diff --git a/system/repository/repository.go b/system/repository/repository.go
index 1b7eb2dca..dd31fd889 100644
--- a/system/repository/repository.go
+++ b/system/repository/repository.go
@@ -15,7 +15,7 @@ type (
 
 // DB produces a contextual DB handle
 func DB(ctx context.Context) *factory.DB {
-	return factory.Database.MustGet("system", "default").With(ctx)
+	return factory.Database.MustGet().With(ctx)
 }
 
 // With updates repository and database contexts
diff --git a/tests/compose/main_test.go b/tests/compose/main_test.go
index e5e2a0dab..8c61dc6f2 100644
--- a/tests/compose/main_test.go
+++ b/tests/compose/main_test.go
@@ -55,7 +55,7 @@ func init() {
 }
 
 func db() *factory.DB {
-	return factory.Database.MustGet(compose.SERVICE, "default").With(context.Background())
+	return factory.Database.MustGet().With(context.Background())
 }
 
 func (app *TestApp) Initialize(ctx context.Context) (err error) {
diff --git a/tests/messaging/main_test.go b/tests/messaging/main_test.go
index 6ecd45c03..659cb19d2 100644
--- a/tests/messaging/main_test.go
+++ b/tests/messaging/main_test.go
@@ -52,7 +52,7 @@ func init() {
 }
 
 func db() *factory.DB {
-	return factory.Database.MustGet(messaging.SERVICE, "default").With(context.Background())
+	return factory.Database.MustGet().With(context.Background())
 }
 
 func (app *TestApp) Initialize(ctx context.Context) (err error) {
diff --git a/tests/system/main_test.go b/tests/system/main_test.go
index 6e2eeaa33..7a130ee81 100644
--- a/tests/system/main_test.go
+++ b/tests/system/main_test.go
@@ -59,7 +59,7 @@ func rs(a ...int) string {
 }
 
 func db() *factory.DB {
-	return factory.Database.MustGet(system.SERVICE, "default").With(context.Background())
+	return factory.Database.MustGet().With(context.Background())
 }
 
 func (app *TestApp) Initialize(ctx context.Context) (err error) {