diff --git a/.env.dev b/.env.sample
similarity index 100%
rename from .env.dev
rename to .env.sample
diff --git a/lib/options-loader.js b/lib/options-loader.js
index 100525d0..1b6f09d0 100644
--- a/lib/options-loader.js
+++ b/lib/options-loader.js
@@ -4,8 +4,9 @@ const os = require('os')
 const argv = require('minimist')(process.argv.slice(2))
 const _ = require('lodash/fp')
 
-require('dotenv').config({ path: `.env${process.env.NODE_ENV !== 'production' ? `.dev` : ``}` })
+require('dotenv').config()
 
+const dbPath =  !process.env.LAMASSU_DB ? 'PROD' : process.env.LAMASSU_DB
 const dbMapping = psqlConf => ({
   STRESS_TEST: _.replace('lamassu', 'lamassu_stress', psqlConf),
   RELEASE: _.replace('lamassu', 'lamassu_release', psqlConf),
@@ -40,11 +41,7 @@ function load () {
       opts: JSON.parse(fs.readFileSync(globalConfigPath))
     }
 
-    config.opts.postgresql = dbMapping(config.opts.postgresql)[
-      process.env.LAMASSU_DB === '' || !process.env.LAMASSU_DB
-      ? 'PROD'
-      : process.env.LAMASSU_DB
-    ]
+    config.opts.postgresql = dbMapping(config.opts.postgresql)[dbPath]
 
     return config
   } catch (_) {
@@ -55,17 +52,7 @@ function load () {
         opts: JSON.parse(fs.readFileSync(homeConfigPath))
       }
 
-      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
-      ]
+      config.opts.postgresql = dbMapping(config.opts.postgresql)[dbPath]
 
       return config
     } catch (_) {