diff --git a/.env b/.env
deleted file mode 100644
index 69fccef7..00000000
--- a/.env
+++ /dev/null
@@ -1 +0,0 @@
-LAMASSU_DB=RELEASE
\ No newline at end of file
diff --git a/.env.dev b/.env.dev
new file mode 100644
index 00000000..db93e716
--- /dev/null
+++ b/.env.dev
@@ -0,0 +1 @@
+LAMASSU_DB=DEV
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 78852c81..f5b53d44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@ terraform.*
 .terraform
 
 db.json
+.env
diff --git a/lib/options-loader.js b/lib/options-loader.js
index 81061d7c..100525d0 100644
--- a/lib/options-loader.js
+++ b/lib/options-loader.js
@@ -4,12 +4,13 @@ const os = require('os')
 const argv = require('minimist')(process.argv.slice(2))
 const _ = require('lodash/fp')
 
-require('dotenv').config()
+require('dotenv').config({ path: `.env${process.env.NODE_ENV !== 'production' ? `.dev` : ``}` })
 
 const dbMapping = psqlConf => ({
   STRESS_TEST: _.replace('lamassu', 'lamassu_stress', psqlConf),
   RELEASE: _.replace('lamassu', 'lamassu_release', psqlConf),
-  DEV: _.replace('lamassu', 'lamassu', psqlConf)
+  DEV: _.replace('lamassu', 'lamassu', psqlConf),
+  PROD: _.replace('lamassu', 'lamassu', psqlConf)
 })
 
 /**
@@ -39,7 +40,11 @@ function load () {
       opts: JSON.parse(fs.readFileSync(globalConfigPath))
     }
 
-    config.opts.postgresql = dbMapping(config.opts.postgresql)[process.env.LAMASSU_DB]
+    config.opts.postgresql = dbMapping(config.opts.postgresql)[
+      process.env.LAMASSU_DB === '' || !process.env.LAMASSU_DB
+      ? 'PROD'
+      : process.env.LAMASSU_DB
+    ]
 
     return config
   } catch (_) {
@@ -50,7 +55,17 @@ function load () {
         opts: JSON.parse(fs.readFileSync(homeConfigPath))
       }
 
-      config.opts.postgresql = dbMapping(config.opts.postgresql)[process.env.LAMASSU_DB]
+      console.log('flag', dbMapping(config.opts.postgresql)[
+        process.env.LAMASSU_DB === '' || !process.env.LAMASSU_DB
+        ? 'PROD'
+        : process.env.LAMASSU_DB
+      ])
+
+      config.opts.postgresql = dbMapping(config.opts.postgresql)[
+        process.env.LAMASSU_DB === '' || !process.env.LAMASSU_DB
+        ? 'PROD'
+        : process.env.LAMASSU_DB
+      ]
 
       return config
     } catch (_) {