diff --git a/docker-compose.yml b/docker-compose.yml
index f8d0408e8c..dc0461cf32 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,8 @@
 version: '3'
 services:
     auth:
+        environment:
+            - NODE_ENV=${NODE_ENV}
         container_name: "${BRANCH_NAME}-auth"
         image: "auth:${TAG}"
         build:
@@ -11,55 +13,66 @@ services:
             - "3000:3000"
 
     salix:
+        environment:
+            - NODE_ENV=${NODE_ENV}
         container_name: "${BRANCH_NAME}-salix"
         image: "salix:${TAG}"
-        build: 
+        build:
             context: ./services/salix
         expose:
             - "3001"
-        ports: 
+        ports:
             - "3001:3001"
-    
+
     client:
+        environment:
+            - NODE_ENV=${NODE_ENV}
         container_name: "${BRANCH_NAME}-client"
         image: "client:${TAG}"
         build:
             context: ./services/client
         expose:
             - "3002"
-        ports: 
+        ports:
             - "3002:3002"
 
     mailer:
+        environment:
+            - NODE_ENV=${NODE_ENV}
         container_name: "${BRANCH_NAME}-mailer"
         image: "mailer:${TAG}"
         build:
             context: ./services/mailer
         expose:
             - "3003"
-        ports: 
+        ports:
             - "3003:3003"
 
     production:
+        environment:
+            - NODE_ENV=${NODE_ENV}
         container_name: "${BRANCH_NAME}-production"
         image: "production:${TAG}"
         build:
             context: ./services/production
         expose:
             - "3004"
-        ports: 
+        ports:
             - "3004:3004"
 
     nginx:
         container_name: "${BRANCH_NAME}-nginx"
         image: "nginx:${TAG}"
-        build: 
+        privileged: true
+        build:
             context: ./services/nginx
-        ports: 
-            - "80:8080"
+        expose:
+            - "80"
+        ports:
+            - "80:80"
         links:
-            - "auth:"${BRANCH_NAME}-auth"
-            - "salix:"${BRANCH_NAME}-salix"
-            - "client:"${BRANCH_NAME}-client"
-            - "mailer:"${BRANCH_NAME}-mailer"
-            - "production:"${BRANCH_NAME}-production"
\ No newline at end of file
+            - "auth:${BRANCH_NAME}-auth"
+            - "salix:${BRANCH_NAME}-salix"
+            - "client:${BRANCH_NAME}-client"
+            - "mailer:${BRANCH_NAME}-mailer"
+            - "production:${BRANCH_NAME}-production"
diff --git a/package.json b/package.json
index d8f1cb3035..921845d90f 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,6 @@
     "nightmare": "^2.10.0",
     "node-sass": "^3.11.0",
     "nodemon": "^1.12.0",
-    "pre-commit": "^1.1.3",
     "raw-loader": "*",
     "sass-loader": "^4.0.2",
     "style-loader": "^0.13.1",
@@ -65,6 +64,8 @@
   "scripts": {
     "build": "webpack --progress --colors",
     "dev": "webpack-dev-server --progress --colors",
-    "lint": "eslint ./ --cache --ignore-pattern .gitignore"
+    "lint": "eslint ./ --cache --ignore-pattern .gitignore",
+    "test": "node services_tests.js",
+    "testWatcher": "nodemon -q services_tests.js -w services"
   }
 }
diff --git a/test_services.sh b/test_services.sh
deleted file mode 100755
index 35f253ead7..0000000000
--- a/test_services.sh
+++ /dev/null
@@ -1 +0,0 @@
-nodemon -q services_tests.js -w services
\ No newline at end of file