diff --git a/Makefile b/Makefile
index 0c17b068d..00a3d041f 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,10 @@ ifeq ($(ROVER),)
 ROVER := lua_modules/bin/rover
 endif
 
+ifneq ($(CI),true)
+S2I_OPTIONS += --copy
+endif
+
 export COMPOSE_PROJECT_NAME
 
 test: ## Run all tests
@@ -69,7 +73,7 @@ prove-docker: ## Test nginx inside docker
 	$(DOCKER_COMPOSE) run --rm -T prove | awk '/Result: NOTESTS/ { print "FAIL: NOTESTS"; print; exit 1 }; { print }'
 
 builder-image: ## Build builder image
-	$(S2I) build . $(BUILDER_IMAGE) $(IMAGE_NAME) --context-dir=$(S2I_CONTEXT) --copy --incremental $(S2I_OPTIONS)
+	$(S2I) build . $(BUILDER_IMAGE) $(IMAGE_NAME) --context-dir=$(S2I_CONTEXT) --incremental $(S2I_OPTIONS)
 
 runtime-image: PULL_POLICY ?= always
 runtime-image: IMAGE_NAME = apicast-runtime-test