diff --git a/Makefile b/Makefile
index 7a3a854..73cea65 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
-DOCKER_RUN = docker-compose run -e UID=`id -u` -e GID=`id -g`
-DOCKER_BUILD = DOCKER_BUILDKIT=1 docker build
+DOCKER_COMPOSE = COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose
+DOCKER_RUN = ${DOCKER_COMPOSE} run -e UID=`id -u` -e GID=`id -g`
 MANAGE = ${DOCKER_RUN} backend python /app/src/manage.py
 
 lint:
 	poetry run pre-commit run --all
 
 run:
-	docker-compose up --build
+	${DOCKER_COMPOSE} up --build
 
 build:
-	docker-compose build
+	${DOCKER_COMPOSE} build
 
 makemessages:
 	${MANAGE} makemessages -a