diff --git a/joal/rootfs/etc/nginx/servers/ingress.conf b/joal/rootfs/etc/nginx/servers/ingress.conf
index 21062ddc9..655186c86 100644
--- a/joal/rootfs/etc/nginx/servers/ingress.conf
+++ b/joal/rootfs/etc/nginx/servers/ingress.conf
@@ -8,18 +8,17 @@ server {
 
     location / { 
        add_header Access-Control-Allow-Origin *;   
+ 
        proxy_connect_timeout 30m;
        proxy_send_timeout 30m;
        proxy_read_timeout 30m;
+
+       RewriteEngine On
+       RewriteCond %{HTTP:Connection} Upgrade [NC]
+       RewriteCond %{HTTP:Upgrade} websocket [NC]
+       RewriteRule /(.*) ws://127.0.0.1:8081/$1 [P,L]
+
        proxy_pass         http://backend/joal/ui/;
   }
 
-    location /ws/ { 
-       add_header Access-Control-Allow-Origin *;   
-       proxy_connect_timeout 30m;
-       proxy_send_timeout 30m;
-       proxy_read_timeout 30m;
-       proxy_pass         http://backend/;
-  }
-
 }