diff --git a/.gitignore b/.gitignore
index 333840cbf..260141fbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ indexer.toml
 .vscode/
 # migrations/
 .helix
+.claude/
 
 # Node.js related files
 crates/dips/node_modules/
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..ab97df6ef
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,12 @@
+services:
+  indexer-service-rs:
+    image: ghcr.io/graphprotocol/indexer-service-rs:${TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile.indexer-service-rs
+
+  indexer-tap-agent:
+    image: ghcr.io/graphprotocol/indexer-tap-agent:${TAG:-local}
+    build:
+      context: .
+      dockerfile: Dockerfile.indexer-tap-agent
diff --git a/justfile b/justfile
index fbc6afb68..9dec95266 100644
--- a/justfile
+++ b/justfile
@@ -24,6 +24,11 @@ fmt:
     cargo fmt
 sqlx-prepare:
     cargo sqlx prepare --workspace  -- --all-targets --all-features
+
+# Build images ghcr.io/graphprotocol/indexer-service-rs and ghcr.io/graphprotocol/indexer-tap-agent (defaults to :local; set TAG=... to override)
+build-image:
+    docker compose build
+
 psql-up: 
     @docker run -d --name indexer-rs-psql -p 5432:5432 -e POSTGRES_PASSWORD=postgres postgres
     @sleep 5