diff --git a/Makefile b/Makefile
index 369298356..4b8f192f6 100644
--- a/Makefile
+++ b/Makefile
@@ -20,22 +20,22 @@ test:
 
 build-base-images:
 	./mvnw clean package -f src/apps/base-images -DskipTests -T4 && \
-	COMPOSE_DOCKER_CLI_BUILD=1 \
-	DOCKER_BUILDKIT=1 \
+	COMPOSE_DOCKER_CLI_BUILD=0 \
+	DOCKER_BUILDKIT=0 \
 	TAG=$(TAG) \
 	docker compose -f docker-build/base-images.yml build 
 
 build-image-infrastructure:
 	./mvnw clean package -f src/apps/infrastructure -DskipTests -T4 && \
-	COMPOSE_DOCKER_CLI_BUILD=1 \
-	DOCKER_BUILDKIT=1 \
+	COMPOSE_DOCKER_CLI_BUILD=0 \
+	DOCKER_BUILDKIT=0 \
 	TAG=$(TAG) \
 	docker compose -f docker-build/infrastructure.yml build
 
 build-image-geoserver:
 	./mvnw clean package -f src/apps/geoserver -DskipTests -T4 && \
-	COMPOSE_DOCKER_CLI_BUILD=1 \
-	DOCKER_BUILDKIT=1 \
+	COMPOSE_DOCKER_CLI_BUILD=0 \
+	DOCKER_BUILDKIT=0 \
 	TAG=$(TAG) \
 	docker compose -f docker-build/geoserver.yml build