diff --git a/src/main/kotlin/application/Configuration.kt b/src/main/kotlin/application/Configuration.kt
index f8597b6..caddf5c 100644
--- a/src/main/kotlin/application/Configuration.kt
+++ b/src/main/kotlin/application/Configuration.kt
@@ -11,15 +11,17 @@ object Configuration {
         val functionFiles: URI = this::class.java.getResource("/sql/functions").toURI()
         val fixtureFiles: URI = this::class.java.getResource("/sql/fixtures").toURI()
     }
+    object Database {
+        val host: String = config.getString("db.host")
+        val port: Int = config.getInt("db.port")
+        var database: String = config.getString("db.database")
+        var username: String = config.getString("db.username")
+        var password: String = config.getString("db.password")
+    }
 
     val envName: String = config.getString("app.envName")
     val domain: String = config.getString("app.domain")
 
-    val host: String = config.getString("db.host")
-    var database: String = config.getString("db.database")
-    var username: String = config.getString("db.username")
-    var password: String = config.getString("db.password")
-    val port: Int = config.getInt("db.port")
     val redis: String = config.getString("redis.connection")
     val elasticsearch: String = config.getString("elasticsearch.connection")
     val rabbitmq: String = config.getString("rabbitmq.connection")
diff --git a/src/main/kotlin/application/KoinModule.kt b/src/main/kotlin/application/KoinModule.kt
index a3007a7..3ef51bf 100644
--- a/src/main/kotlin/application/KoinModule.kt
+++ b/src/main/kotlin/application/KoinModule.kt
@@ -58,11 +58,11 @@ val KoinModule = module {
     // SQL connection
     single {
         Connection(
-            host = Configuration.host,
-            port = Configuration.port,
-            database = Configuration.database,
-            username = Configuration.username,
-            password = Configuration.password
+            host = Configuration.Database.host,
+            port = Configuration.Database.port,
+            database = Configuration.Database.database,
+            username = Configuration.Database.username,
+            password = Configuration.Database.password
         )
     }
 
diff --git a/src/test/kotlin/CucumberTest.kt b/src/test/kotlin/CucumberTest.kt
index d80daba..d4cc8b6 100644
--- a/src/test/kotlin/CucumberTest.kt
+++ b/src/test/kotlin/CucumberTest.kt
@@ -32,9 +32,9 @@ class CucumberTest : En, KoinTest {
 
     init {
         if (!unitialized) {
-            Configuration.database = "test"
-            Configuration.username = "test"
-            Configuration.password = "test"
+            Configuration.Database.database = "test"
+            Configuration.Database.username = "test"
+            Configuration.Database.password = "test"
 
             withTestApplication({ module(CUCUMBER) }) {
                 migrations()
@@ -43,9 +43,9 @@ class CucumberTest : En, KoinTest {
         }
 
         Before(-1) { _: Scenario ->
-            Configuration.database = "test"
-            Configuration.username = "test"
-            Configuration.password = "test"
+            Configuration.Database.database = "test"
+            Configuration.Database.username = "test"
+            Configuration.Database.password = "test"
             ktorContext.start()
             //language=PostgreSQL
             get<Connection>().sendQuery("start transaction;", listOf())
@@ -59,9 +59,9 @@ class CucumberTest : En, KoinTest {
     }
 
     private fun migrations() {
-        Configuration.database = "test"
-        Configuration.username = "test"
-        Configuration.password = "test"
+        Configuration.Database.database = "test"
+        Configuration.Database.username = "test"
+        Configuration.Database.password = "test"
         val migrations: Migrations = get()
         migrations.forceAllDown()
         migrations.run()