diff --git a/roles/webgateway/templates/nginx.conf b/roles/webgateway/templates/nginx.conf
index 6b4c6e9..fe01e74 100644
--- a/roles/webgateway/templates/nginx.conf
+++ b/roles/webgateway/templates/nginx.conf
@@ -49,6 +49,9 @@ http {
         proxy_connect_timeout   90;
         proxy_send_timeout 120;
         proxy_read_timeout 300;
+        proxy_buffer_size          128k;
+        proxy_buffers              4 256k;
+        proxy_busy_buffers_size    256k;
         proxy_buffering    off;
         proxy_request_buffering off;
 
diff --git a/roles/webserver/files/nginx.conf b/roles/webserver/files/nginx.conf
index 0cf6b87..40ce8c9 100644
--- a/roles/webserver/files/nginx.conf
+++ b/roles/webserver/files/nginx.conf
@@ -48,6 +48,9 @@ http {
         proxy_connect_timeout   90;
         proxy_send_timeout 120;
         proxy_read_timeout 300;
+        proxy_buffer_size          128k;
+        proxy_buffers              4 256k;
+        proxy_busy_buffers_size    256k;
         proxy_buffering    off;
         proxy_request_buffering off;