diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index bb351fee..9dcba1ec 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -1,23 +1,12 @@
-all:
+build-all:
 	docker build -t danceos/fail-base fail-base
 	docker build -t danceos/fail-generic-tracing fail-generic-tracing
 	docker build -t danceos/fail-demo fail-demo
 
+run-all: .compose ssh
 
-run-fail-db:
-	docker run --rm --name fail-db \
-		-e MYSQL_ROOT_PASSWORD=fail \
-		-e MYSQL_USER=fail \
-		-e MYSQL_PASSWORD=fail \
-		-e MYSQL_DATABASE=fail \
-		-p 3306:3306 \
-		-d mysql
+.compose:
+	docker compose up -d --force-recreate --renew-anon-volumes -y
 
-run-fail-demo:
-	docker run --rm --name fail-demo \
-		-p 5000:5000 \
-		-p 5022:22 \
-		-d danceos/fail-demo
-
-ssh-fail-demo:
+ssh:
 	ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 5022 fail@127.0.0.1
diff --git a/scripts/docker/docker-compose.yaml b/scripts/docker/docker-compose.yaml
new file mode 100644
index 00000000..e356c6ae
--- /dev/null
+++ b/scripts/docker/docker-compose.yaml
@@ -0,0 +1,26 @@
+services:
+  fail-db:
+    image: mysql
+    container_name: fail-db
+    environment:
+      MYSQL_ROOT_PASSWORD: fail
+      MYSQL_USER: fail
+      MYSQL_PASSWORD: fail
+      MYSQL_DATABASE: fail
+    # ports:
+    #   - "3306:3306"
+    networks:
+      - fail-network
+
+  fail-demo:
+    image: danceos/fail-demo
+    container_name: fail-demo
+    ports:
+      - "5000:5000" # Result Browser
+      - "5022:22" # SSH
+    networks:
+      - fail-network
+
+networks:
+  fail-network:
+    driver: bridge