diff --git a/docker-compose.yml b/docker-compose.yml
index 8b3c42a..d856180 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,9 @@ services:
     restart: always
     build: ./node
     image: custom/node
+    environment:
+      mongousr: myTester
+      mongopwd: test
     ports:
       - '3001:3001'
     links:
@@ -18,6 +21,8 @@ services:
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: ruth
+      mongousr: myTester
+      mongopwd: test
     ports:
       - 27017:27017
   prometheus:
diff --git a/mongo/Dockerfile b/mongo/Dockerfile
index 70052b0..8a8a93e 100644
--- a/mongo/Dockerfile
+++ b/mongo/Dockerfile
@@ -1,5 +1,8 @@
 FROM mongo
 
-COPY dbusersetup.js /docker-entrypoint-initdb.d
+COPY db-user-setup.sh /docker-entrypoint-initdb.d
+
+# ENV mongousr=myTester
+# ENV mongopwd=test
 
 EXPOSE 27017
\ No newline at end of file
diff --git a/mongo/dbusersetup.js b/mongo/db-user-setup.js
similarity index 63%
rename from mongo/dbusersetup.js
rename to mongo/db-user-setup.js
index e25017b..7d576a7 100644
--- a/mongo/dbusersetup.js
+++ b/mongo/db-user-setup.js
@@ -1,10 +1,8 @@
-// create test user
-use test
 db.createUser(
   {
-    user: "myTester",
-    pwd: "test",
+    user: "$mongousr",
+    pwd: "$mongopwd",
     roles: [ { role: "readWrite", db: "test" },
              { role: "read", db: "reporting" } ]
   }
-)
+);
diff --git a/mongo/db-user-setup.sh b/mongo/db-user-setup.sh
new file mode 100644
index 0000000..f5a85ec
--- /dev/null
+++ b/mongo/db-user-setup.sh
@@ -0,0 +1,10 @@
+set -e
+
+mongo <<EOF
+db.createUser({
+  user:  '$mongousr',
+  pwd: '$mongopwd',
+    roles: [ { role: "readWrite", db: "test" },
+             { role: "read", db: "reporting" } ]
+})
+EOF
\ No newline at end of file
diff --git a/node/Dockerfile b/node/Dockerfile
index 30643eb..675c7a7 100755
--- a/node/Dockerfile
+++ b/node/Dockerfile
@@ -14,6 +14,11 @@ COPY package.json /app
 RUN npm install
 COPY . /app
 
+# ENV mongousr=myTester
+# ENV mongopwd=test
+
+RUN sh check-env.sh
+
 CMD node app.js
 
 EXPOSE 3001
diff --git a/node/app.js b/node/app.js
index e2b316b..8e55e70 100755
--- a/node/app.js
+++ b/node/app.js
@@ -2,7 +2,7 @@ var express = require('express');
 var app = express();
 var mongoose = require('mongoose');
 var Schema = mongoose.Schema;
-var database = 'mongodb://root:ruth@mongo:27017/admin';
+var database = 'mongodb://' + process.env.mongousr + ':' + process.env.mongopwd + '@mongo:27017/test';
 var today = new Date();
 var counter = 0;
 var Prometheus = require("prom-client");
@@ -17,6 +17,8 @@ const libUptime = new Prometheus.Counter({
   help: 'uptime A counter of the application\'s uptime in seconds.'
 })
 
+console.log('mongousr: ', process.env.mongousr);
+console.log('mongopwd: ', process.env.mongopwd);
 
 // const collectDefaultMetrics = Prometheus.collectDefaultMetrics;
 // Probe every 5th second.
@@ -53,6 +55,9 @@ app.get('/metrics', function(req, res){
   libUptime.reset();
 });
 
+app.get('/env', function(req, res){
+  
+});
 
 
 app.get('/', (req, res)=>{
diff --git a/node/check-env.sh b/node/check-env.sh
new file mode 100644
index 0000000..8148853
--- /dev/null
+++ b/node/check-env.sh
@@ -0,0 +1,14 @@
+if [ -z "$mongousr" ]
+then
+      echo "\$mongousr is empty"
+      exit 1
+else
+      echo "\$mongousr is NOT empty"
+      if [ -z "$mongopwd" ]
+        then
+            echo "\$mongopwd is empty"
+            exit 1
+        else
+            echo "\$mongopwd is NOT empty"
+        fi   
+fi