diff --git a/config/config.js b/config/config.js
index b0717f0..79ddc0a 100644
--- a/config/config.js
+++ b/config/config.js
@@ -1,24 +1,6 @@
+import common from './env/common'
+
 const env = process.env.NODE_ENV || 'development'
+const config = require(`./env/${env}`).default
 
-const config = {
-  common: {
-    port: process.env.PORT || 5000
-  },
-  test: {
-    session: 'secret-boilerplate-token',
-    token: 'secret-jwt-token',
-    database: 'mongodb://localhost:27017/test'
-  },
-  development: {
-    session: 'secret-boilerplate-token',
-    token: 'secret-jwt-token',
-    database: 'mongodb://localhost:27017/koa2-boilerplate'
-  },
-  production: {
-    session: 'secret-boilerplate-token',
-    token: 'secret-jwt-token',
-    database: 'mongodb://localhost:27017/koa2-boilerplate'
-  }
-}
-
-export default Object.assign({}, config.common, config[env])
+export default Object.assign({}, common, config)
diff --git a/config/env/common.js b/config/env/common.js
new file mode 100644
index 0000000..9b237b0
--- /dev/null
+++ b/config/env/common.js
@@ -0,0 +1,3 @@
+export default {
+  port: process.env.PORT || 5000
+}
diff --git a/config/env/development.js b/config/env/development.js
new file mode 100644
index 0000000..c77d155
--- /dev/null
+++ b/config/env/development.js
@@ -0,0 +1,5 @@
+export default {
+  session: 'secret-boilerplate-token',
+  token: 'secret-jwt-token',
+  database: 'mongodb://localhost:27017/koa2-boilerplate-dev'
+}
diff --git a/config/env/production.js b/config/env/production.js
new file mode 100644
index 0000000..4423425
--- /dev/null
+++ b/config/env/production.js
@@ -0,0 +1,5 @@
+export default {
+  session: 'secret-boilerplate-token',
+  token: 'secret-jwt-token',
+  database: 'mongodb://localhost:27017/koa2-boilerplate-prod'
+}
diff --git a/config/env/test.js b/config/env/test.js
new file mode 100644
index 0000000..e73169c
--- /dev/null
+++ b/config/env/test.js
@@ -0,0 +1,5 @@
+export default {
+  session: 'secret-boilerplate-token',
+  token: 'secret-jwt-token',
+  database: 'mongodb://localhost:27017/koa2-boilerplate-test'
+}