diff --git a/defaults/main.yml b/defaults/main.yml
index 1cb8e10..854145a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -26,7 +26,10 @@ nginx_multi_accept: 'off'
 nginx_worker_rlimit_nofile: 2048
 nginx_server_tokens: 'off'
 
-nginx_large_client_header_buffers: 4 8k
+nginx_default_max_buffers_size: 16
+nginx_client_header_buffer_size: '{{ nginx_default_max_buffers_size / 2 }}k'
+nginx_client_body_buffer_size: '{{ nginx_default_max_buffers_size }}k'
+nginx_large_client_header_buffers: '4 {{ nginx_default_max_buffers_size }}k'
 
 nginx_enable_compression: True
 nginx_gzip_vary: "on"
@@ -50,13 +53,13 @@ nginx_set_original_uri: True
 nginx_proxy_buffering: "on"
 nginx_proxy_redirect: "off"
 nginx_x_forwarded_host: "$remote_addr"
-nginx_proxy_buffer_size: 128k
-nginx_proxy_buffers: '4 {{ nginx_proxy_buffer_size }}'
-nginx_proxy_busy_buffers_size: 256k
+nginx_proxy_buffer_size: {{ nginx_default_max_buffers_size * 8 }}
+nginx_proxy_buffers: '4 {{ nginx_proxy_buffer_size }}k'
+nginx_proxy_busy_buffers_size: {{ nginx_proxy_buffer_size * 2 }}
 nginx_proxy_connect_timeout: 30s
 nginx_proxy_read_timeout: 480s
 nginx_proxy_send_timeout: 120s
-nginx_proxy_temp_file_write_size: '{{ nginx_proxy_buffer_size }}'
+nginx_proxy_temp_file_write_size: '{{ nginx_proxy_buffer_size * 2 }}k'
 nginx_proxy_force_ranges: "off"
 nginx_client_max_body_size: 100M
 nginx_client_body_timeout: 240s
diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2
index 9dc5392..b53d7e2 100644
--- a/templates/nginx.conf.j2
+++ b/templates/nginx.conf.j2
@@ -37,6 +37,8 @@ http {
     # server_name_in_redirect off;
     include /etc/nginx/mime.types;
     default_type application/octet-stream;
+    client_header_buffer_size {{ nginx_client_header_buffer_size }};
+    client_body_buffer_size {{ nginx_client_body_buffer_size }};
     large_client_header_buffers {{ nginx_large_client_header_buffers }};
     ##
     # Logging Settings