diff --git a/nginx.conf.j2 b/nginx.conf.j2
index f19e5f8..a631064 100644
--- a/nginx.conf.j2
+++ b/nginx.conf.j2
@@ -83,15 +83,20 @@ http {
         ssl_prefer_server_ciphers on;
         add_header Strict-Transport-Security max-age=15768000;
 
-        {# allow large file uploads, currently 500 meg.  Should be increased if we really need big uploads #}
-        client_max_body_size 500M;
+        {# allow large file uploads, currently 50 gig.  We expect the app to block if needed #}
+        client_max_body_size 50000M;
 
         # Set headers
         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;
-    
+
+        {# We do not buffer, otherwise we might end up string the full client_max_body size as a temp file. Let the upstream handle it #}
+        proxy_buffering off;
+        proxy_request_buffering off;
+        client_body_buffer_size 1024k;
+
         {# enable websockets: http://nginx.org/en/docs/http/websocket.html #}
         proxy_http_version 1.1;
         proxy_set_header   Upgrade    $http_upgrade;