diff --git a/Makefile b/Makefile
index 6122e4594..bf7e99bcd 100644
--- a/Makefile
+++ b/Makefile
@@ -143,12 +143,12 @@ run: build
 ## docker-build: Build Docker image (minimal Alpine-based)
 docker-build:
 	@echo "Building minimal Docker image (Alpine-based)..."
-	docker-compose build
+	docker compose build
 
 ## docker-build-full: Build Docker image with full MCP support (Node.js 24)
 docker-build-full:
 	@echo "Building full-featured Docker image (Node.js 24)..."
-	docker-compose -f docker-compose.full.yml build
+	docker compose -f docker-compose.full.yml build
 
 ## docker-test: Test MCP tools in Docker container
 docker-test:
@@ -158,24 +158,24 @@ docker-test:
 
 ## docker-run: Run picoclaw gateway in Docker (Alpine-based)
 docker-run:
-	docker-compose --profile gateway up
+	docker compose --profile gateway up
 
 ## docker-run-full: Run picoclaw gateway in Docker (full-featured)
 docker-run-full:
-	docker-compose -f docker-compose.full.yml --profile gateway up
+	docker compose -f docker-compose.full.yml --profile gateway up
 
 ## docker-run-agent: Run picoclaw agent in Docker (interactive, Alpine-based)
 docker-run-agent:
-	docker-compose run --rm picoclaw-agent
+	docker compose run --rm picoclaw-agent
 
 ## docker-run-agent-full: Run picoclaw agent in Docker (interactive, full-featured)
 docker-run-agent-full:
-	docker-compose -f docker-compose.full.yml run --rm picoclaw-agent
+	docker compose -f docker-compose.full.yml run --rm picoclaw-agent
 
 ## docker-clean: Clean Docker images and volumes
 docker-clean:
-	docker-compose down -v
-	docker-compose -f docker-compose.full.yml down -v
+	docker compose down -v
+	docker compose -f docker-compose.full.yml down -v
 	docker rmi picoclaw:latest picoclaw:full 2>/dev/null || true
 
 ## help: Show this help message
diff --git a/scripts/test-docker-mcp.sh b/scripts/test-docker-mcp.sh
index eb8901f45..a0c9e232a 100644
--- a/scripts/test-docker-mcp.sh
+++ b/scripts/test-docker-mcp.sh
@@ -11,39 +11,39 @@ echo ""
 
 # Build the image
 echo "📦 Building Docker image..."
-docker-compose -f "$COMPOSE_FILE" build
+docker compose -f "$COMPOSE_FILE" build
 
 # Test npx
 echo "✅ Testing npx..."
-docker-compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'npx --version'
+docker compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'npx --version'
 
 # Test npm
 echo "✅ Testing npm..."
-docker-compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'npm --version'
+docker compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'npm --version'
 
 # Test node
 echo "✅ Testing Node.js..."
-docker-compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'node --version'
+docker compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'node --version'
 
 # Test git
 echo "✅ Testing git..."
-docker-compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'git --version'
+docker compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'git --version'
 
 # Test python
 echo "✅ Testing Python..."
-docker-compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'python3 --version'
+docker compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'python3 --version'
 
 # Test uv
 echo "✅ Testing uv..."
-docker-compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'uv --version'
+docker compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'uv --version'
 
 # Test MCP server installation (quick)
 echo "✅ Testing MCP server install with npx..."
-docker-compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'npx -y cowsay "MCP works!"'
+docker compose -f "$COMPOSE_FILE" run --rm --entrypoint sh "$SERVICE" -c 'npx -y cowsay "MCP works!"'
 
 echo ""
 echo "🎉 All MCP tools are working correctly!"
 echo ""
 echo "Next steps:"
 echo "  1. Configure MCP servers in config/config.json"
-echo "  2. Run: docker-compose -f $COMPOSE_FILE --profile gateway up"
+echo "  2. Run: docker compose -f $COMPOSE_FILE --profile gateway up"