diff --git a/templates/nginx.default.conf.j2 b/templates/nginx.default.conf.j2
index fea0eee..82705d4 100644
--- a/templates/nginx.default.conf.j2
+++ b/templates/nginx.default.conf.j2
@@ -31,7 +31,7 @@ server {
   client_body_timeout {{ nginx_pep_body_timeout }};
 
 {% if inception_project_websockets_enabled == 'true' %}
-  location /inception/ws {
+  location /ws {
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "Upgrade";
@@ -45,6 +45,7 @@ server {
   location / {
     proxy_http_version 1.1;
     proxy_set_header Host $host;
+    proxy_redirect http://{{ inception_project_server_endpoint }}/ /;
     proxy_set_header X-Real-IP $remote_addr;
     proxy_set_header Connection ""; # Clear for keepalive
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;