diff --git a/cluster/saltbase/salt/nginx/kubernetes-site b/cluster/saltbase/salt/nginx/kubernetes-site
index 9702614358d..458ebf90f6c 100644
--- a/cluster/saltbase/salt/nginx/kubernetes-site
+++ b/cluster/saltbase/salt/nginx/kubernetes-site
@@ -47,15 +47,19 @@ server {
           auth_basic_user_file  /usr/share/nginx/htpasswd;
 
           # Proxy settings
+          # disable buffering so that watch works
+          proxy_buffering off;
           proxy_pass http://127.0.0.1:8080/;
           proxy_connect_timeout 159s;
           proxy_send_timeout   600s;
           proxy_read_timeout   600s;
-          proxy_buffer_size    64k;
-          proxy_buffers     16 32k;
-          proxy_busy_buffers_size 64k;
-          proxy_temp_file_write_size 64k;
+          
           # Disable retry
           proxy_next_upstream off;
+
+          # Support web sockets
+          proxy_http_version 1.1;
+          proxy_set_header Upgrade $http_upgrade;
+          proxy_set_header Connection "upgrade";
         }
 }