diff --git a/conf/nginx.conf b/conf/nginx.conf
index 5dee3de..bbba431 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -11,12 +11,18 @@ location ~ ^__PATH__/api/v[0-9]+/(users/)?websocket$ {
     proxy_set_header X-Frame-Options SAMEORIGIN;
     proxy_buffers 256 16k;
     proxy_buffer_size 16k;
-    proxy_read_timeout 600s;
+    client_body_timeout 60s;
+    send_timeout 300s;
+    lingering_timeout 5s;
+    proxy_connect_timeout 90s;
+    proxy_send_timeout 300s;
+    proxy_read_timeout 90s;
+    proxy_http_version 1.1;
     proxy_pass http://127.0.0.1:__PORT__;
 }
 
 location __PATH__/ {
-    client_max_body_size 50M;
+    client_max_body_size 100M;
     proxy_set_header Connection "";
     proxy_set_header Host $host;
     proxy_set_header X-Real-IP $remote_addr;
@@ -26,12 +32,6 @@ location __PATH__/ {
     proxy_buffers 256 16k;
     proxy_buffer_size 16k;
     proxy_read_timeout 600s;
-    # Disable the proxy cache, because the proxy_cache_path directive
-    # cannot be embeded in a `server` block.
-    #proxy_cache mattermost_cache;
-    #proxy_cache_revalidate on;
-    #proxy_cache_min_uses 2;
-    #proxy_cache_use_stale timeout;
-    #proxy_cache_lock on;
+    proxy_http_version 1.1;
     proxy_pass http://127.0.0.1:__PORT__;
 }