diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 38be14aa..de1ff88e 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -8,10 +8,12 @@ http {
     charset utf-8;
 
     upstream minioUI {
+        least_conn;
         server minio:9001;
     }
 
     upstream minioAPI {
+        least_conn;
         server minio:9000;
     }
 
@@ -55,15 +57,26 @@ http {
 
         #Minio storage
         location /files/UI/ {
+            rewrite ^/files/UI/(.*) /$1 break;
             proxy_set_header Host $http_host;
             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_set_header X-NginX-Proxy true;
+
+            # This is necessary to pass the correct IP to be hashed
+            real_ip_header X-Real-IP;
 
             proxy_connect_timeout 300;
-            # Default is HTTP/1, keepalive is only enabled in HTTP/1.1
+
+            # To support websockets in MinIO versions released after January 2023
             proxy_http_version 1.1;
-            proxy_set_header Connection "";
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            # Some environments may encounter CORS errors (Kubernetes + Nginx Ingress)
+            # Uncomment the following line to set the Origin request to an empty string
+            # proxy_set_header Origin '';
+
             chunked_transfer_encoding off;
 
             proxy_pass http://minioUI/login;