diff --git a/build-containers.py b/build-containers.py
index 388a68a3..3b8e398f 100644
--- a/build-containers.py
+++ b/build-containers.py
@@ -21,7 +21,6 @@ parser.add_argument("--check-only", action="store_true", help="looks at what\'s
 parser.add_argument("--dry-run", action="store_true", help="don\'t do anything, just print the commands that would be executed")
 
 args = parser.parse_args()
-print(args)
 
 verbose = args.verbose
 quiet = args.quiet
diff --git a/cluster-list.txt b/cluster-list.txt
index d99e9f24..a7823065 100644
--- a/cluster-list.txt
+++ b/cluster-list.txt
@@ -2,7 +2,7 @@ contract
 db-sharding
 db
 eth-statediff-fill-service
-go-ethereum
+go-ethereum-foundry
 ipld-eth-beacon-db
 ipld-eth-beacon-indexer
 ipld-eth-server
diff --git a/compose/docker-compose-go-ethereum-foundry.yml b/compose/docker-compose-go-ethereum-foundry.yml
index d29f78cb..234f94b7 100644
--- a/compose/docker-compose-go-ethereum-foundry.yml
+++ b/compose/docker-compose-go-ethereum-foundry.yml
@@ -6,11 +6,7 @@ services:
     depends_on:
       ipld-eth-db:
         condition: service_healthy
-    build:
-      context: ../../
-      dockerfile: ./docker/local/go-ethereum.Dockerfile
-      args:
-        GENESIS_FILE_PATH: ${genesis_file_path}
+    image: vulcanize/go-ethereum-foundry
     healthcheck:
       test: ["CMD", "nc", "-v", "localhost", "8545"]
       interval: 30s
diff --git a/compose/docker-compose-ipld-eth-beacon-db.yml b/compose/docker-compose-ipld-eth-beacon-db.yml
index 9bb38003..58e936a0 100644
--- a/compose/docker-compose-ipld-eth-beacon-db.yml
+++ b/compose/docker-compose-ipld-eth-beacon-db.yml
@@ -2,7 +2,7 @@ version: "3.2"
 services:
   ipld-eth-beacon-db:
     restart: always
-    image: vulcanize/ipld-eth-beacon-db:v0.2.0
+    image: vulcanize/ipld-eth-beacon-db:local
     environment:
       POSTGRES_USER: vdbm
       POSTGRES_DB: vulcanize_testing
diff --git a/compose/docker-compose-ipld-eth-beacon-indexer.yml b/compose/docker-compose-ipld-eth-beacon-indexer.yml
index 0ca3f287..52d133dd 100644
--- a/compose/docker-compose-ipld-eth-beacon-indexer.yml
+++ b/compose/docker-compose-ipld-eth-beacon-indexer.yml
@@ -5,7 +5,7 @@ services:
     depends_on:
       - ipld-eth-beacon-db
       - lighthouse
-    image: vulcanize/ipld-eth-beacon-indexer:v0.2.0
+    image: vulcanize/ipld-eth-beacon-indexer:local
     volumes:
       - type: bind
         source: ${eth_beacon_config_file}
diff --git a/compose/docker-compose-ipld-eth-server.yml b/compose/docker-compose-ipld-eth-server.yml
index 39b2d23f..c22a634b 100644
--- a/compose/docker-compose-ipld-eth-server.yml
+++ b/compose/docker-compose-ipld-eth-server.yml
@@ -5,7 +5,7 @@ services:
     depends_on:
       ipld-eth-db:
         condition: service_healthy
-    image: vulcanize/ipld-eth-server:v4.0.5-alpha
+    image: vulcanize/ipld-eth-server:local
     environment:
       IPLD_SERVER_GRAPHQL: "true"
       IPLD_POSTGRAPHILEPATH: http://graphql:5000
@@ -46,4 +46,3 @@ services:
       SCHEMA: public,eth
     ports:
       - "127.0.0.1:5000:5000"
-      
\ No newline at end of file
diff --git a/compose/docker-compose-lighthouse.yml b/compose/docker-compose-lighthouse.yml
index e69de29b..887b398e 100644
--- a/compose/docker-compose-lighthouse.yml
+++ b/compose/docker-compose-lighthouse.yml
@@ -0,0 +1,17 @@
+version: "3.2"
+services:
+  lighthouse:
+    restart: always
+    image: vulcanize/lighthouse:local
+    environment:
+      - NETWORK=mainnet
+    volumes:
+      - lighthouse_db:/root/.lighthouse
+    ports:
+      - 127.0.0.1:5052:5052
+      - 9000:9000/udp
+      - 9000:9000/tcp
+    command: ["tail", "-f", "/dev/null"]
+
+volumes:
+  lighthouse_db:
\ No newline at end of file
diff --git a/deploy-system.py b/deploy-system.py
index 17337bdd..354c80fe 100644
--- a/deploy-system.py
+++ b/deploy-system.py
@@ -12,13 +12,16 @@ parser.add_argument("--verbose", action="store_true", help="increase output verb
 parser.add_argument("--quiet", action="store_true", help="don\'t print informational output")
 parser.add_argument("--check-only", action="store_true", help="looks at what\'s already there and checks if it looks good")
 parser.add_argument("--dry-run", action="store_true", help="don\'t do anything, just print the commands that would be executed")
+parser.add_argument("--exclude", type=str, help="don\'t start these components")
+parser.add_argument("--include", type=str, help="only start these components")
 
 args = parser.parse_args()
-print(args)
 
 verbose = args.verbose
 quiet = args.quiet
 
+print(args)
+
 with open("cluster-list.txt") as cluster_list_file:
     clusters = cluster_list_file.read().splitlines()
 
@@ -37,5 +40,6 @@ print(f"files: {compose_files}")
 # See: https://gabrieldemarmiesse.github.io/python-on-whales/sub-commands/compose/
 docker = DockerClient(compose_files=compose_files)
 
-docker.compose.up()
+if not args.dry_run:
+    docker.compose.up()
 
diff --git a/setup-repositories.py b/setup-repositories.py
index d75c24f6..129569d3 100644
--- a/setup-repositories.py
+++ b/setup-repositories.py
@@ -35,7 +35,6 @@ parser.add_argument("--check-only", action="store_true", help="looks at what\'s
 parser.add_argument("--dry-run", action="store_true", help="don\'t do anything, just print the commands that would be executed")
 
 args = parser.parse_args()
-print(args)
 
 verbose = args.verbose
 quiet = args.quiet