diff --git a/Makefile b/Makefile
index 61d42b4ff96..7d59295b0d0 100644
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,8 @@ docker buildx bake --allow=fs.read=.. \
 	$(if $(findstring $(comma),$(DOCKER_TARGET_PLATFORMS)),,\
 		$(if $(local-dest),\
 			$(foreach service, $(SERVICES_NAMES_TO_BUILD),\
-				--set $(service).output="type=docker$(comma)dest=$(local-dest)/$(service).tar") \
+				--set $(service).output="type=oci$(comma)\
+				compression=zstd$(comma)compression-level=9$(comma)force-compression=true$(comma)dest=$(local-dest)/$(service)zstd.tar") \
 			,--load\
 		)\
 	)\
@@ -204,7 +205,8 @@ docker buildx bake --allow=fs.read=.. \
 				--set $(service).tags=$(DOCKER_REGISTRY)/$(service):$(DOCKER_IMAGE_TAG) \
 		) \
 		$(foreach service, $(SERVICES_NAMES_TO_BUILD),\
-			--set $(service).output="type=registry$(comma)push=true" \
+			--set $(service).output="type=registry$(comma)\
+			compression=zstd$(comma)compression-level=1$(comma)force-compression=true$$(comma)push=true" \
 		)\
 	,) \
 	$(if $(push),--push,) \
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
index 8919cecf3e7..e56f9f848f7 100644
--- a/services/docker-compose.yml
+++ b/services/docker-compose.yml
@@ -7,7 +7,6 @@ x-dask-tls-secrets: &dask_tls_secrets
 # mode: 444 # not supported by docker stack compose as of 26.0.0
 
 ## common environs
-
 x-common-logging: &common_logging_environments
   LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
   LOG_FILTER_MAPPING: ${LOG_FILTER_MAPPING}