diff --git a/docker-compose.yml b/docker-compose.yml
index afdd7a7..1f3a63e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,9 +16,10 @@ services:
     image: villasweb-backend
     links:
       - database
+    environment:
+      - NODE_ENV=production
 
   database:
     image: mongo:latest
-    volumes:
-      - /opt/database:/data/db
-
+#    volumes:
+#      - /opt/database:/data/db
diff --git a/nginx/villas.conf b/nginx/villas.conf
index f3417de..7fd9ee9 100644
--- a/nginx/villas.conf
+++ b/nginx/villas.conf
@@ -7,10 +7,10 @@ server {
     proxy_redirect off;
     proxy_set_header Host $http_host;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    
+
     # rewrite url to exclude /api on context broker side
-    rewrite ^/api/?(.*) /api/v1/$1 break;
-    
+    rewrite ^/api/?(.*) /api/$1 break;
+
     proxy_pass http://backend:4000/;
   }
 
diff --git a/package.json b/package.json
index 0116f0a..81c7ea6 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "name": "villasweb-frontend",
   "version": "0.1.0",
   "private": true,
+  "proxy": "http://localhost:4000",
   "dependencies": {
     "bootstrap": "^3.3.7",
     "classnames": "^2.2.5",
diff --git a/src/data-managers/rest-data-manager.js b/src/data-managers/rest-data-manager.js
index 10fb65a..f4fd82f 100644
--- a/src/data-managers/rest-data-manager.js
+++ b/src/data-managers/rest-data-manager.js
@@ -22,7 +22,7 @@
 import RestAPI from '../api/rest-api';
 import AppDispatcher from '../app-dispatcher';
 
-const API_URL = 'http://localhost:4000/api/v1';
+const API_URL = '/api/v1';
 
 class RestDataManager {
   constructor(type, url, keyFilter) {