diff --git a/Makefile b/Makefile
index 4ac3cd1..f19a6c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,20 @@
 DIR_SQL	 = PostgreSQL
 DIR_BACK = back-end
+DOCKER_COMPOSE = docker compose
 
 all: build
 
 build: dev
 
 dev: $(DIR_BACK)/.env
-	. $(DIR_BACK)/.env && docker compose -f docker-compose.dev.yml up 
+	set -o allexport  # Required to source correctly .env with old docker-compose
+	(. $(DIR_BACK)/.env && $(DOCKER_COMPOSE) -f docker-compose.dev.yml up) || true
+	+o allexport
 
 prod:
-	. $(DIR_BACK)/.env.production && docker compose -f docker-compose.prod.yml up 
+	set -o allexport  # Required to source correctly .env with old docker-compose
+	(. $(DIR_BACK)/.env.production && $(DOCKER_COMPOSE) -f docker-compose.prod.yml up) || true
+	+o allexport
 
 $(DIR_BACK)/.env: $(DIR_BACK)/.env.example
 	cp $(DIR_BACK)/.env.example $(DIR_BACK)/.env
@@ -20,9 +25,9 @@ clean:
 	# Delete the db volume
 	sudo ${RM} -r dev-db || true
 	cd $(DIR_SQL) && make clean
-	docker compose -f docker-compose.dev.yml down --rmi local -v --remove-orphans || true
+	$(DOCKER_COMPOSE) -f docker-compose.dev.yml down --rmi local -v --remove-orphans || true
 
 clean_prod: clean
-	docker compose -f docker-compose.prod.yml down --rmi local -v --remove-orphans || true
+	$(DOCKER_COMPOSE) -f docker-compose.prod.yml down --rmi local -v --remove-orphans || true
 
 .PHONY: clean all prepare_dev build clean_prod