diff --git a/Makefile b/Makefile
index cd67742885..2e5acd1a6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 DOCKER ?= docker
-DOCKER_COMPOSE ?= $(DOCKER)-compose
+DOCKER_COMPOSE ?= $(DOCKER) compose
 
 export PATH := ./venv/bin:$(PATH)
 
diff --git a/conf/nginx/server-base.conf.jnj b/conf/nginx/server-base.conf.jnj
index 106f015e8e..c7f0b000c0 100644
--- a/conf/nginx/server-base.conf.jnj
+++ b/conf/nginx/server-base.conf.jnj
@@ -98,6 +98,8 @@ location ~ ^/_storage_proxy/([^/]+)/([^/]+)/([^/]+)/(.+) {
 
     proxy_buffering off;
     proxy_request_buffering off;
+    proxy_buffer_size 32k;
+    proxy_buffers 4 32k;
 
     proxy_read_timeout 60s;
 }
@@ -171,6 +173,8 @@ location ~ /v2/([^/]+)(/[^/]+)+/blobs/ {
 
     proxy_buffering off;
     proxy_request_buffering off;
+    proxy_buffer_size 32k;
+    proxy_buffers 4 32k;
     proxy_read_timeout 2000;
     proxy_send_timeout 2000;
     proxy_temp_path /tmp 1 2;