diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..c7853b5
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,23 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: debug-statements
+      - id: trailing-whitespace
+        exclude: tests/api-mocks/aiapi.yaml
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.8.2
+    hooks:
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
+
+  - repo: https://github.com/compilerla/conventional-pre-commit
+    rev: v3.6.0
+    hooks:
+      - id: conventional-pre-commit
+        stages: [commit-msg]
+        args: []
diff --git a/CLAUDE.md b/CLAUDE.md
index dd78739..b220c36 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -15,14 +15,14 @@ uv run -m mcontainer.cli
 ## Lint/Test Commands
 ```bash
 # Run linting
-uv run --with=ruff ruff check .
+uvx ruff check .
 
 # Run type checking (note: currently has unresolved stub dependencies)
 # Skip for now during development
 # uv run --with=mypy mypy .
 
 # Run formatting
-uv run --with=ruff ruff format .
+uvx ruff format .
 
 # Run all tests
 uv run -m pytest
diff --git a/README.md b/README.md
index b452e06..5d93cd7 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,19 @@
 # MC - Monadical Container Tool
 
-MC (Monadical Container) is a command-line tool for managing ephemeral containers that run AI tools and development environments. It works with both local Docker and a dedicated remote web service that manages containers in a Docker-in-Docker (DinD) environment.
+MC (Monadical Container) is a command-line tool for managing ephemeral
+containers that run AI tools and development environments. It works with both
+local Docker and a dedicated remote web service that manages containers in a
+Docker-in-Docker (DinD) environment.
+
+## Requirements
+
+- [uv](https://docs.astral.sh/uv/)
 
 ## Installation
 
 ```bash
 # Clone the repository
-git clone https://github.com/monadical/mc.git
+git clone https://github.com/monadical/mcontainer.git
 cd mc
 
 # Install with uv
@@ -71,15 +78,15 @@ Drivers are defined in the `drivers/` directory, with each subdirectory containi
 uv run -m pytest
 
 # Run linting
-uv run --with=ruff ruff check .
+uvx ruff check .
 
 # Run type checking
-uv run --with=mypy mypy .
+uvx mypy .
 
 # Format code
-uv run --with=ruff ruff format .
+uvx ruff format .
 ```
 
 ## License
 
-See LICENSE file for details.
\ No newline at end of file
+See LICENSE file for details.
diff --git a/drivers/goose/init-status.sh b/drivers/goose/init-status.sh
index 8372817..993a2b7 100644
--- a/drivers/goose/init-status.sh
+++ b/drivers/goose/init-status.sh
@@ -19,12 +19,12 @@ follow_init_logs() {
         echo "No initialization logs found."
         return
     fi
-    
+
     echo "Initialization is still in progress. Showing logs:"
     echo "----------------------------------------"
     tail -f /init.log &
     tail_pid=$!
-    
+
     # Check every second if initialization has completed
     while true; do
         if [ -f "/init.status" ] && grep -q "INIT_COMPLETE=true" "/init.status"; then