diff --git a/nginx.default.conf b/nginx.default.conf
index 52c4545..4dd7b54 100644
--- a/nginx.default.conf
+++ b/nginx.default.conf
@@ -2,17 +2,8 @@ server {
     listen       80 default_server;
     server_name  labmashup;
 
-    # proxy for ember-cli
-    location ^~ /frontend/ {
-        proxy_redirect off;
-        proxy_set_header Host $http_host;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-	
-	proxy_pass http://ember:4200/frontend/;
-    }
-
     # proxy for orion context broker
-    location ^~ /api/ {
+    location /api/ {
         proxy_redirect off;
         proxy_set_header Host $http_host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -34,7 +25,16 @@ server {
         add_header Access-Control-Allow-Origin '*' always;
         add_header Access-Control-Allow-Credentials 'true' always;
 
-        proxy_pass http://orion:1026;
+        proxy_pass http://orion:1026/;
+    }
+
+    # proxy for ember-cli
+    location / {
+        proxy_redirect off;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	
+	proxy_pass http://ember:4200/;
     }
 
     error_page  404 /404.html;