diff --git a/config/config.exs b/config/config.exs
index 5a3723c..ba0ba24 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -5,7 +5,7 @@
 # is restricted to this project.
 
 # General application configuration
-use Mix.Config
+import Config
 
 config :wabanex,
   ecto_repos: [Wabanex.Repo]
@@ -32,4 +32,4 @@ config :phoenix, :json_library, Jason
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
-import_config "#{Mix.env()}.exs"
+import_config "#{config_env()}.exs"
diff --git a/config/dev.exs b/config/dev.exs
index 02f9bcc..1faf08e 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -1,11 +1,8 @@
-use Mix.Config
+import Config
 
 # Configure your database
 config :wabanex, Wabanex.Repo,
-  username: System.get_env("POSTGRES_USER") || "postgres",
-  password: System.get_env("POSTGRES_PASS") || "postgres",
   database: "wabanex_dev",
-  hostname: System.get_env("POSTGRES_HOST") || "localhost",
   show_sensitive_data_on_connection_error: true,
   pool_size: 10
 
diff --git a/config/prod.exs b/config/prod.exs
index 73f6a1d..10f9447 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 # For production, don't forget to configure the url host
 # to something meaningful, Phoenix uses this information
diff --git a/config/runtime.exs b/config/runtime.exs
new file mode 100644
index 0000000..7120844
--- /dev/null
+++ b/config/runtime.exs
@@ -0,0 +1,6 @@
+import Config
+
+config :wabanex, Wabanex.Repo,
+  username: System.get_env("POSTGRES_USER") || "postgres",
+  password: System.get_env("POSTGRES_PASS") || "postgres",
+  hostname: System.get_env("POSTGRES_HOST") || "localhost"
diff --git a/config/test.exs b/config/test.exs
index 1e96411..7f17a31 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 # Configure your database
 #
@@ -6,10 +6,7 @@ use Mix.Config
 # to provide built-in test partitioning in CI environment.
 # Run `mix help test` for more information.
 config :wabanex, Wabanex.Repo,
-  username: System.get_env("POSTGRES_USER") || "postgres",
-  password: System.get_env("POSTGRES_PASS") || "postgres",
   database: "wabanex_test#{System.get_env("MIX_TEST_PARTITION")}",
-  hostname: System.get_env("POSTGRES_HOST") || "localhost",
   pool: Ecto.Adapters.SQL.Sandbox
 
 # We don't run a server during test. If one is required,