diff --git a/Makefile b/Makefile
index b3fdc54b5f07683d8539085110e085f0c28e5606..ef44ba7479a4a66da1847a6fc66eebc87efe4d8d 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,18 @@ docker.init::
 	@echo "Creating Docker Volume for Engine Socket at '$(AURA_ENGINE_CORE_SOCKET)'"
 	docker volume create aura_engine_socket
 
+compose.build::
+	docker compose build
+
+compose.up::
+	docker compose up
+
+compose.up.detached::
+	docker compose up -d
+
+compose.down::
+	docker compose down
+
 audio.lqs.test::
 	pw-jack liquidsoap tests/device/alsa_device_aura_engine.liq
 
diff --git a/build/docker.Makefile b/build/docker.Makefile
index 83e13fb351efb8eaea93753448c8e774221e4c12..2d3628b73481b29455f8e12024c3b8ed0951b2b8 100644
--- a/build/docker.Makefile
+++ b/build/docker.Makefile
@@ -23,7 +23,7 @@ docker.deps:
 	@which docker
 
 # Targets
-
+# FIXME: change to docker compose
 docker.build:: docker.deps
 	@docker build -t autoradio/$(APP_NAME) .