diff --git a/Makefile b/Makefile
index a083816..9855332 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ help:
 # Development
 dev:
 	@echo "Starting local development database..."
-	docker-compose -f docker-compose.dev.yml up -d
+	docker compose -f docker-compose.dev.yml up -d
 	@echo ""
 	@echo "Database is ready at localhost:5432"
 	@echo "Database: feuerwehr_dev"
@@ -32,10 +32,10 @@ dev:
 	@echo "Password: dev_password"
 
 logs-dev:
-	docker-compose -f docker-compose.dev.yml logs -f
+	docker compose -f docker-compose.dev.yml logs -f
 
 rebuild-dev:
-	docker-compose -f docker-compose.dev.yml up -d --build --force-recreate
+	docker compose -f docker-compose.dev.yml up -d --build --force-recreate
 
 # Production
 prod:
@@ -46,24 +46,24 @@ prod:
 		exit 1; \
 	fi
 	@echo "Starting production deployment..."
-	docker-compose -f docker-compose.yml up -d --build
+	docker compose -f docker-compose.yml up -d --build
 	@echo ""
 	@echo "Production services are running!"
 
 logs-prod:
-	docker-compose -f docker-compose.yml logs -f
+	docker compose -f docker-compose.yml logs -f
 
 logs:
 	@make logs-prod
 
 rebuild:
-	docker-compose -f docker-compose.yml up -d --build --force-recreate
+	docker compose -f docker-compose.yml up -d --build --force-recreate
 
 # General commands
 stop:
 	@echo "Stopping all services..."
-	docker-compose -f docker-compose.yml down 2>/dev/null || true
-	docker-compose -f docker-compose.dev.yml down 2>/dev/null || true
+	docker compose -f docker-compose.yml down 2>/dev/null || true
+	docker compose -f docker-compose.dev.yml down 2>/dev/null || true
 	@echo "All services stopped"
 
 clean:
@@ -71,8 +71,8 @@ clean:
 	@read -p "Are you sure? [y/N] " -n 1 -r; \
 	echo; \
 	if [ "$$REPLY" = "y" ] || [ "$$REPLY" = "Y" ]; then \
-		docker-compose -f docker-compose.yml down -v 2>/dev/null || true; \
-		docker-compose -f docker-compose.dev.yml down -v 2>/dev/null || true; \
+		docker compose -f docker-compose.yml down -v 2>/dev/null || true; \
+		docker compose -f docker-compose.dev.yml down -v 2>/dev/null || true; \
 		docker images | grep feuerwehr | awk '{print $$3}' | xargs docker rmi -f 2>/dev/null || true; \
 		echo "Cleanup complete!"; \
 	else \