diff --git a/SAS/TMSS/deploy/tmss/nginx/default.conf b/SAS/TMSS/deploy/tmss/nginx/default.conf
index 1a6faff1932bdf1c83270e6bc491873fc7653dd6..b10f6fea95a5d40570804263b0a412d5e0e651d0 100644
--- a/SAS/TMSS/deploy/tmss/nginx/default.conf
+++ b/SAS/TMSS/deploy/tmss/nginx/default.conf
@@ -2,9 +2,6 @@ upstream django {
     server app:8001;
 }
 
-# upstream websocket {
-#     server websocket:5678;
-# }
 
 server {
     listen 8008;
@@ -13,26 +10,71 @@ server {
     add_header Content-Security-Policy "default-src 'self' data: https://cdnjs.cloudflare.com; style-src 'self' 'unsafe-inline' https://stackpath.bootstrapcdn.com https://fonts.googleapis.com https://cdnjs.cloudflare.com; font-src 'self' data: https://stackpath.bootstrapcdn.com https://fonts.gstatic.com; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdnjs.cloudflare.com; connect-src 'self' ws://localhost:5678 ws://tmss.lofar.eu:5678 https://faro-collector-prod-eu-west-2.grafana.net/collect/8b2ee2532bfff84be000d24235916b3b; img-src 'self' data: blob: https://tile.openstreetmap.org  https://server.arcgisonline.com https://cdnjs.cloudflare.com";
     add_header Referrer-Policy 'strict-origin';
 
-    location / {
+   location / {
+    rewrite ^/(?!((static/)|(manifest\.json)|(favicon\.ico))).*$ /tmss-frontend-web-production/build/index.html break;
+    proxy_pass https://s3.lofar.net/tmss-frontend-web-production/build/;
+    proxy_set_header Host s3.lofar.net;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_pass_header Server;
+    proxy_ssl_name s3.lofar.net;
+    proxy_ssl_server_name on; 
+}
+
+    location /api/ {
+        try_files $uri @proxy_to_app;
+    }
+
+    location /oidc/ {
         try_files $uri @proxy_to_app;
     }
 
+    location /workflow_api/ {
+        try_files $uri @proxy_to_app;
+    }
+
+    location /admin/ {
+        try_files $uri @proxy_to_app;   
+    }
+    
+    location /schedule/ {
+        try_files $uri @proxy_to_app;   
+    }
+
+    location /schedule {
+        try_files $uri @proxy_to_app;   
+    }
+
+    location /past_schedule/ {
+        try_files $uri @proxy_to_app;   
+    }
+
+    location /past_schedule {
+        try_files $uri @proxy_to_app;   
+    }
+    
+    location /wss/ {
+        try_files $uri @proxy_to_app;
+    }
 
     location /nginx_status {
         stub_status on;
         access_log off;
     }
 
-location /acc/ {
-    rewrite ^/acc/(?!((static/)|(manifest\.json)|(favicon\.ico))).*$ /tmss-frontend-web-acceptance/build/index.html break;
+    location /acc/ {
+       rewrite ^/acc/(?!((static/)|(manifest\.json)|(favicon\.ico))).*$ /tmss-frontend-web-acceptance/build/index.html break;
 
-    proxy_pass https://s3.lofar.net//tmss-frontend-web-acceptance/build/;
-    proxy_set_header Host tmss.lofar.eu;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header X-Forwarded-Proto $scheme;
-    proxy_pass_header Server;
-}
+       proxy_pass https://s3.lofar.net/tmss-frontend-web-acceptance/build/;
+       proxy_set_header Host s3.lofar.net;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+       proxy_set_header X-Forwarded-Proto $scheme;
+       proxy_pass_header Server;
+       proxy_ssl_name s3.lofar.net;
+       proxy_ssl_server_name on; 
+   }
 
 
     location @proxy_to_app {
@@ -54,25 +96,9 @@ location /acc/ {
         try_files $uri @proxy_to_ws;
     }
 
-#     location @proxy_to_ws {
-#         proxy_pass http://websocket;
-#
-#         proxy_http_version 1.1;
-#         proxy_set_header Upgrade $http_upgrade;
-#         proxy_set_header Connection upgrade;
-#
-#         proxy_redirect off;
-#         proxy_set_header Host tmss.lofar.eu;
-#         proxy_set_header X-Real-IP $remote_addr;
-#         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-#         proxy_set_header X-Forwarded-Host $server_name;
-#
-#         # disables proxy cache completely. does not go well with websockets
-#         proxy_cache_bypass 1;
-#         proxy_no_cache 1;
-#     }
-
-    location /static/ {
-        alias /opt/lofar/staticfiles/;
+
+    location /static/rest_framework/ {
+        alias /opt/lofar/staticfiles/rest_framework/;
     }
+ 
 }