diff --git a/compose/docker-compose-fixturenet-eth.yml b/compose/docker-compose-fixturenet-eth.yml
index 705b15ec..d105221f 100644
--- a/compose/docker-compose-fixturenet-eth.yml
+++ b/compose/docker-compose-fixturenet-eth.yml
@@ -52,11 +52,11 @@ services:
   fixturenet-eth-lighthouse-1:
     hostname: fixturenet-eth-lighthouse-1
     healthcheck:
-      test: ["CMD", "/opt/testnet/cl/ready.sh"]
+      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
       interval: 30s
       timeout: 10s
       retries: 10
-      start_period: 300s
+      start_period: 30s
     env_file:
       - ../config/fixturenet-eth/fixturenet-eth.env
     environment:
@@ -75,11 +75,11 @@ services:
   fixturenet-eth-lighthouse-2:
     hostname: fixturenet-eth-lighthouse-2
     healthcheck:
-      test: ["CMD", "/opt/testnet/cl/ready.sh"]
+      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
       interval: 30s
       timeout: 10s
       retries: 10
-      start_period: 300s
+      start_period: 30s
     env_file:
       - ../config/fixturenet-eth/fixturenet-eth.env
     environment:
diff --git a/compose/docker-compose-ipld-eth-beacon.yml b/compose/docker-compose-ipld-eth-beacon.yml
deleted file mode 100644
index bf2d048b..00000000
--- a/compose/docker-compose-ipld-eth-beacon.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: "3.2"
-services:
-  ipld-eth-beacon-db:
-    restart: always
-    image: cerc/ipld-eth-beacon-db:local
-    environment:
-      POSTGRES_USER: vdbm
-      POSTGRES_DB: cerc_testing
-      POSTGRES_PASSWORD: password
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    ports:
-      - "127.0.0.1:8076:5432"
-  ipld-eth-beacon-indexer:
-    restart: unless-stopped
-    depends_on:
-      ipld-eth-beacon-db:
-        condition: service_healthy
-      fixturenet-eth-lighthouse-1:
-        condition: service_healthy
-    image: cerc/ipld-eth-beacon-indexer:local
-    env_file:
-      - ../config/ipld-eth-beacon/indexer.env
diff --git a/config/ipld-eth-beacon/indexer.env b/config/ipld-eth-beacon/indexer.env
deleted file mode 100644
index b19800aa..00000000
--- a/config/ipld-eth-beacon/indexer.env
+++ /dev/null
@@ -1,31 +0,0 @@
-# Match compose/docker-compose-ipld-eth-beacon-db.yml
-POSTGRES_HOST=ipld-eth-beacon-db
-POSTGRES_PORT=5432
-POSTGRES_DB=cerc_testing
-POSTGRES_USER=vdbm
-POSTGRES_PASSWORD=password
-
-# Match compose/docker-compose-fixturenet-eth.yml
-LIGHTHOUSE_HOST=fixturenet-eth-lighthouse-1
-LIGHTHOUSE_PORT=8001
-LIGHTHOUSE_PROTOCOL=http
-
-CAPTURE_MODE=head
-LOG_LEVEL=debug
-
-BC_MAX_HISTORIC_PROCESS_WORKER=2
-BC_UNIQUE_NODE_IDENTIFIER=1001
-BC_CHECK_DB=true
-BC_BEACON_STATE_PROCESSING_ENABLED=false
-BC_BEACON_BLOCK_PROCESSING_ENABLED=true
-BC_MINIMUM_SLOT=0
-
-KG_INCREMENT=10000
-KG_PROCESS_KNOWN_GAPS_ENABLED=true
-KG_MAX_KNOWN_GAPS_WORKER=2
-KG_MINIMUM_SLOT=0
-
-# Match compose/docker-compose-prometheus-grafana.yml
-PROM_HOST=prometheus
-PROM_PORT=9000
-PROM_METRICS_ENABLED=false
diff --git a/pod-list.txt b/pod-list.txt
index cf3a273c..6a363325 100644
--- a/pod-list.txt
+++ b/pod-list.txt
@@ -2,7 +2,8 @@ contract
 db
 eth-statediff-fill-service
 go-ethereum-foundry
-ipld-eth-beacon
+ipld-eth-beacon-db
+ipld-eth-beacon-indexer
 ipld-eth-server
 lighthouse
 prometheus-grafana