From b0fc62b7019803d5e4037b40a4ed1ff5bd96a4ef Mon Sep 17 00:00:00 2001
From: Para Dox <armhole.limeade_0l@icloud.com>
Date: Sat, 24 May 2025 02:24:42 +0700
Subject: [PATCH] configurable

---
 ...bitrum-one-nitro-pruned-pebble-hash--fireeth.yml |  4 ++++
 .../bsc-mainnet-bsc-pruned-pebble-path--fireeth.yml |  4 ++++
 ...et-geth-pruned-leveldb-hash--nimbus--fireeth.yml |  4 ++++
 ...net-geth-pruned-pebble-path--nimbus--fireeth.yml |  4 ++++
 ...-mainnet-op-geth-pruned-pebble-path--fireeth.yml |  4 ++++
 ...-mainnet-op-geth-pruned-pebble-path--fireeth.yml |  4 ++++
 ...-mainnet-op-geth-pruned-pebble-path--fireeth.yml |  4 ++++
 ...ircuit-garfield-op-geth-archive-leveldb-hash.yml | 13 +++----------
 ...zircuit-garfield-op-geth-archive-pebble-hash.yml | 13 +++----------
 .../zircuit-garfield-op-geth-pruned-pebble-hash.yml | 13 +++----------
 .../zircuit-garfield-op-geth-pruned-pebble-path.yml | 13 +++----------
 ...zircuit-mainnet-op-geth-archive-leveldb-hash.yml | 13 +++----------
 .../zircuit-mainnet-op-geth-archive-pebble-hash.yml | 13 +++----------
 .../zircuit-mainnet-op-geth-pruned-pebble-hash.yml  | 13 +++----------
 .../zircuit-mainnet-op-geth-pruned-pebble-path.yml  | 13 +++----------
 ...zircuit-testnet-op-geth-archive-leveldb-hash.yml | 13 +++----------
 .../zircuit-testnet-op-geth-archive-pebble-hash.yml | 13 +++----------
 .../zircuit-testnet-op-geth-pruned-pebble-hash.yml  | 13 +++----------
 .../zircuit-testnet-op-geth-pruned-pebble-path.yml  | 13 +++----------
 ...ygon-mainnet-bor-pruned-pebble-path--fireeth.yml |  4 ++++
 ...solana-mainnet-agave-pruned-rocksdb--firesol.yml |  4 ++++
 ...solana-testnet-agave-pruned-rocksdb--firesol.yml |  4 ++++
 22 files changed, 76 insertions(+), 120 deletions(-)

diff --git a/arb/nitro/arbitrum-one-nitro-pruned-pebble-hash--fireeth.yml b/arb/nitro/arbitrum-one-nitro-pruned-pebble-hash--fireeth.yml
index 800f1f3e..b296f9d8 100644
--- a/arb/nitro/arbitrum-one-nitro-pruned-pebble-hash--fireeth.yml
+++ b/arb/nitro/arbitrum-one-nitro-pruned-pebble-hash--fireeth.yml
@@ -105,6 +105,8 @@ services:
       - ${ARBITRUM_ONE_FIREETH_BLOCKS_STORE:-/app/firehose-data/storage/merged-blocks}
     entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start firehose index-builder relayer merger $@, _]
     command:
+      - --firehose-rate-limit-bucket-fill-rate=${ARBITRUM_ONE_FIREHOSE_RATE_LIMIT_BUCKET_FILL_RATE:-1s}
+      - --firehose-rate-limit-bucket-size=${ARBITRUM_ONE_FIREHOSE_RATE_LIMIT_BUCKET_SIZE:-200}
       - --log-to-file=false
       - --relayer-source=arbitrum-one:10010
     restart: unless-stopped
@@ -134,7 +136,9 @@ services:
     command:
       - --common-live-blocks-addr=arbitrum-one-firehose:10014
       - --log-to-file=false
+      - --substreams-block-execution-timeout=${ARBITRUM_ONE_SUBSTREAMS_BLOCK_EXECUTION_TIMEOUT:-30m0s}
       - --substreams-rpc-endpoints=${ARBITRUM_ONE_EXECUTION_ARCHIVE_RPC}
+      - --substreams-tier1-max-subrequests=${ARBITRUM_ONE_SUBSTREAMS_TIER1_MAX_SUBREQUESTS:-20}
     restart: unless-stopped
     depends_on:
       - arbitrum-one
diff --git a/bsc/bsc/bsc-mainnet-bsc-pruned-pebble-path--fireeth.yml b/bsc/bsc/bsc-mainnet-bsc-pruned-pebble-path--fireeth.yml
index f43104ac..944875be 100644
--- a/bsc/bsc/bsc-mainnet-bsc-pruned-pebble-path--fireeth.yml
+++ b/bsc/bsc/bsc-mainnet-bsc-pruned-pebble-path--fireeth.yml
@@ -112,6 +112,8 @@ services:
       - ${BSC_MAINNET_FIREETH_BLOCKS_STORE:-/app/firehose-data/storage/merged-blocks}
     entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start firehose index-builder relayer merger $@, _]
     command:
+      - --firehose-rate-limit-bucket-fill-rate=${BSC_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_FILL_RATE:-1s}
+      - --firehose-rate-limit-bucket-size=${BSC_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_SIZE:-200}
       - --log-to-file=false
       - --relayer-source=bsc-mainnet:10010
     restart: unless-stopped
@@ -141,7 +143,9 @@ services:
     command:
       - --common-live-blocks-addr=bsc-mainnet-firehose:10014
       - --log-to-file=false
+      - --substreams-block-execution-timeout=${BSC_MAINNET_SUBSTREAMS_BLOCK_EXECUTION_TIMEOUT:-30m0s}
       - --substreams-rpc-endpoints=${BSC_MAINNET_EXECUTION_ARCHIVE_RPC}
+      - --substreams-tier1-max-subrequests=${BSC_MAINNET_SUBSTREAMS_TIER1_MAX_SUBREQUESTS:-20}
     restart: unless-stopped
     depends_on:
       - bsc-mainnet
diff --git a/ethereum/geth/ethereum-mainnet-geth-pruned-leveldb-hash--nimbus--fireeth.yml b/ethereum/geth/ethereum-mainnet-geth-pruned-leveldb-hash--nimbus--fireeth.yml
index a91e2676..d1654737 100644
--- a/ethereum/geth/ethereum-mainnet-geth-pruned-leveldb-hash--nimbus--fireeth.yml
+++ b/ethereum/geth/ethereum-mainnet-geth-pruned-leveldb-hash--nimbus--fireeth.yml
@@ -115,6 +115,8 @@ services:
       - ${ETHEREUM_MAINNET_FIREETH_BLOCKS_STORE:-/app/firehose-data/storage/merged-blocks}
     entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start firehose index-builder relayer merger $@, _]
     command:
+      - --firehose-rate-limit-bucket-fill-rate=${ETHEREUM_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_FILL_RATE:-1s}
+      - --firehose-rate-limit-bucket-size=${ETHEREUM_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_SIZE:-200}
       - --log-to-file=false
       - --relayer-source=ethereum-mainnet-geth:10010
     restart: unless-stopped
@@ -144,7 +146,9 @@ services:
     command:
       - --common-live-blocks-addr=ethereum-mainnet-geth-firehose:10014
       - --log-to-file=false
+      - --substreams-block-execution-timeout=${ETHEREUM_MAINNET_SUBSTREAMS_BLOCK_EXECUTION_TIMEOUT:-30m0s}
       - --substreams-rpc-endpoints=${ETHEREUM_MAINNET_EXECUTION_ARCHIVE_RPC}
+      - --substreams-tier1-max-subrequests=${ETHEREUM_MAINNET_SUBSTREAMS_TIER1_MAX_SUBREQUESTS:-20}
     restart: unless-stopped
     depends_on:
       - ethereum-mainnet-geth
diff --git a/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path--nimbus--fireeth.yml b/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path--nimbus--fireeth.yml
index b46544ff..f68faca8 100644
--- a/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path--nimbus--fireeth.yml
+++ b/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path--nimbus--fireeth.yml
@@ -115,6 +115,8 @@ services:
       - ${ETHEREUM_MAINNET_FIREETH_BLOCKS_STORE:-/app/firehose-data/storage/merged-blocks}
     entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start firehose index-builder relayer merger $@, _]
     command:
+      - --firehose-rate-limit-bucket-fill-rate=${ETHEREUM_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_FILL_RATE:-1s}
+      - --firehose-rate-limit-bucket-size=${ETHEREUM_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_SIZE:-200}
       - --log-to-file=false
       - --relayer-source=ethereum-mainnet-geth:10010
     restart: unless-stopped
@@ -144,7 +146,9 @@ services:
     command:
       - --common-live-blocks-addr=ethereum-mainnet-geth-firehose:10014
       - --log-to-file=false
+      - --substreams-block-execution-timeout=${ETHEREUM_MAINNET_SUBSTREAMS_BLOCK_EXECUTION_TIMEOUT:-30m0s}
       - --substreams-rpc-endpoints=${ETHEREUM_MAINNET_EXECUTION_ARCHIVE_RPC}
+      - --substreams-tier1-max-subrequests=${ETHEREUM_MAINNET_SUBSTREAMS_TIER1_MAX_SUBREQUESTS:-20}
     restart: unless-stopped
     depends_on:
       - ethereum-mainnet-geth
diff --git a/op/geth/base-mainnet-op-geth-pruned-pebble-path--fireeth.yml b/op/geth/base-mainnet-op-geth-pruned-pebble-path--fireeth.yml
index cc0cbcd2..01fec8e5 100644
--- a/op/geth/base-mainnet-op-geth-pruned-pebble-path--fireeth.yml
+++ b/op/geth/base-mainnet-op-geth-pruned-pebble-path--fireeth.yml
@@ -118,6 +118,8 @@ services:
       - ${BASE_MAINNET_FIREETH_BLOCKS_STORE:-/app/firehose-data/storage/merged-blocks}
     entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start firehose index-builder relayer merger $@, _]
     command:
+      - --firehose-rate-limit-bucket-fill-rate=${BASE_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_FILL_RATE:-1s}
+      - --firehose-rate-limit-bucket-size=${BASE_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_SIZE:-200}
       - --log-to-file=false
       - --relayer-source=base-mainnet:10010
     restart: unless-stopped
@@ -147,7 +149,9 @@ services:
     command:
       - --common-live-blocks-addr=base-mainnet-firehose:10014
       - --log-to-file=false
+      - --substreams-block-execution-timeout=${BASE_MAINNET_SUBSTREAMS_BLOCK_EXECUTION_TIMEOUT:-30m0s}
       - --substreams-rpc-endpoints=${BASE_MAINNET_EXECUTION_ARCHIVE_RPC}
+      - --substreams-tier1-max-subrequests=${BASE_MAINNET_SUBSTREAMS_TIER1_MAX_SUBREQUESTS:-20}
     restart: unless-stopped
     depends_on:
       - base-mainnet
diff --git a/op/geth/op-mainnet-op-geth-pruned-pebble-path--fireeth.yml b/op/geth/op-mainnet-op-geth-pruned-pebble-path--fireeth.yml
index a0e66d48..4e77fe04 100644
--- a/op/geth/op-mainnet-op-geth-pruned-pebble-path--fireeth.yml
+++ b/op/geth/op-mainnet-op-geth-pruned-pebble-path--fireeth.yml
@@ -119,6 +119,8 @@ services:
       - ${OP_MAINNET_FIREETH_BLOCKS_STORE:-/app/firehose-data/storage/merged-blocks}
     entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start firehose index-builder relayer merger $@, _]
     command:
+      - --firehose-rate-limit-bucket-fill-rate=${OP_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_FILL_RATE:-1s}
+      - --firehose-rate-limit-bucket-size=${OP_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_SIZE:-200}
       - --log-to-file=false
       - --relayer-source=op-mainnet:10010
     restart: unless-stopped
@@ -148,7 +150,9 @@ services:
     command:
       - --common-live-blocks-addr=op-mainnet-firehose:10014
       - --log-to-file=false
+      - --substreams-block-execution-timeout=${OP_MAINNET_SUBSTREAMS_BLOCK_EXECUTION_TIMEOUT:-30m0s}
       - --substreams-rpc-endpoints=${OP_MAINNET_EXECUTION_ARCHIVE_RPC}
+      - --substreams-tier1-max-subrequests=${OP_MAINNET_SUBSTREAMS_TIER1_MAX_SUBREQUESTS:-20}
     restart: unless-stopped
     depends_on:
       - op-mainnet
diff --git a/op/geth/unichain-mainnet-op-geth-pruned-pebble-path--fireeth.yml b/op/geth/unichain-mainnet-op-geth-pruned-pebble-path--fireeth.yml
index f51b93f1..48f666bc 100644
--- a/op/geth/unichain-mainnet-op-geth-pruned-pebble-path--fireeth.yml
+++ b/op/geth/unichain-mainnet-op-geth-pruned-pebble-path--fireeth.yml
@@ -118,6 +118,8 @@ services:
       - ${UNICHAIN_MAINNET_FIREETH_BLOCKS_STORE:-/app/firehose-data/storage/merged-blocks}
     entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start firehose index-builder relayer merger $@, _]
     command:
+      - --firehose-rate-limit-bucket-fill-rate=${UNICHAIN_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_FILL_RATE:-1s}
+      - --firehose-rate-limit-bucket-size=${UNICHAIN_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_SIZE:-200}
       - --log-to-file=false
       - --relayer-source=unichain-mainnet:10010
     restart: unless-stopped
@@ -147,7 +149,9 @@ services:
     command:
       - --common-live-blocks-addr=unichain-mainnet-firehose:10014
       - --log-to-file=false
+      - --substreams-block-execution-timeout=${UNICHAIN_MAINNET_SUBSTREAMS_BLOCK_EXECUTION_TIMEOUT:-30m0s}
       - --substreams-rpc-endpoints=${UNICHAIN_MAINNET_EXECUTION_ARCHIVE_RPC}
+      - --substreams-tier1-max-subrequests=${UNICHAIN_MAINNET_SUBSTREAMS_TIER1_MAX_SUBREQUESTS:-20}
     restart: unless-stopped
     depends_on:
       - unichain-mainnet
diff --git a/op/geth/zircuit-garfield-op-geth-archive-leveldb-hash.yml b/op/geth/zircuit-garfield-op-geth-archive-leveldb-hash.yml
index d099f194..a7f162de 100644
--- a/op/geth/zircuit-garfield-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/zircuit-garfield-op-geth-archive-leveldb-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-garfield-archive:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${GARFIELD_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_GARFIELD_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,13 +51,11 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_GARFIELD_WS_SECRET}@${ZIRCUIT_GARFIELD_ETH_STATS_SERVER}:${ZIRCUIT_GARFIELD_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-us.garfield-testnet.zircuit.com?token=drpcV4hDaEwatB9G3zgk8gBkaH5s4TVMGeuUvlBIiVTD
       - GETH_TXPOOL_GLOBALQUEUE=1024
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=leveldb
       - --gcmode=archive
@@ -65,7 +63,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=garfield
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -108,7 +105,7 @@ services:
       - traefik.http.routers.zircuit-garfield-op-geth-archive-leveldb-hash.middlewares=zircuit-garfield-op-geth-archive-leveldb-hash-stripprefix, ipallowlist
 
   zircuit-garfield-archive-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${GARFIELD_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_GARFIELD_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     ports:
       - 17296:17296
       - 17296:17296/udp
@@ -126,7 +123,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=garfield
+      - OP_NODE_NETWORK=zircuit-garfield
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
       - OP_NODE_P2P_LISTEN_TCP_PORT=17296
@@ -135,10 +132,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-garfield-op-geth-archive-pebble-hash.yml b/op/geth/zircuit-garfield-op-geth-archive-pebble-hash.yml
index 6b8ea5d9..5cc46c0f 100644
--- a/op/geth/zircuit-garfield-op-geth-archive-pebble-hash.yml
+++ b/op/geth/zircuit-garfield-op-geth-archive-pebble-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-garfield-archive:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${GARFIELD_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_GARFIELD_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,13 +51,11 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_GARFIELD_WS_SECRET}@${ZIRCUIT_GARFIELD_ETH_STATS_SERVER}:${ZIRCUIT_GARFIELD_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-us.garfield-testnet.zircuit.com?token=drpcV4hDaEwatB9G3zgk8gBkaH5s4TVMGeuUvlBIiVTD
       - GETH_TXPOOL_GLOBALQUEUE=1024
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=archive
@@ -65,7 +63,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=garfield
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -108,7 +105,7 @@ services:
       - traefik.http.routers.zircuit-garfield-op-geth-archive-pebble-hash.middlewares=zircuit-garfield-op-geth-archive-pebble-hash-stripprefix, ipallowlist
 
   zircuit-garfield-archive-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${GARFIELD_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_GARFIELD_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     ports:
       - 16723:16723
       - 16723:16723/udp
@@ -126,7 +123,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=garfield
+      - OP_NODE_NETWORK=zircuit-garfield
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
       - OP_NODE_P2P_LISTEN_TCP_PORT=16723
@@ -135,10 +132,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-garfield-op-geth-pruned-pebble-hash.yml b/op/geth/zircuit-garfield-op-geth-pruned-pebble-hash.yml
index 94e9c7da..6447fda7 100644
--- a/op/geth/zircuit-garfield-op-geth-pruned-pebble-hash.yml
+++ b/op/geth/zircuit-garfield-op-geth-pruned-pebble-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-garfield:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${GARFIELD_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_GARFIELD_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,13 +51,11 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_GARFIELD_WS_SECRET}@${ZIRCUIT_GARFIELD_ETH_STATS_SERVER}:${ZIRCUIT_GARFIELD_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-us.garfield-testnet.zircuit.com?token=drpcV4hDaEwatB9G3zgk8gBkaH5s4TVMGeuUvlBIiVTD
       - GETH_TXPOOL_GLOBALQUEUE=1024
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=full
@@ -65,7 +63,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=garfield
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -108,7 +105,7 @@ services:
       - traefik.http.routers.zircuit-garfield-op-geth-pruned-pebble-hash.middlewares=zircuit-garfield-op-geth-pruned-pebble-hash-stripprefix, ipallowlist
 
   zircuit-garfield-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${GARFIELD_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_GARFIELD_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     ports:
       - 17397:17397
       - 17397:17397/udp
@@ -126,7 +123,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=garfield
+      - OP_NODE_NETWORK=zircuit-garfield
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
       - OP_NODE_P2P_LISTEN_TCP_PORT=17397
@@ -135,10 +132,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-garfield-op-geth-pruned-pebble-path.yml b/op/geth/zircuit-garfield-op-geth-pruned-pebble-path.yml
index a8513c30..399236b0 100644
--- a/op/geth/zircuit-garfield-op-geth-pruned-pebble-path.yml
+++ b/op/geth/zircuit-garfield-op-geth-pruned-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-garfield:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${GARFIELD_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_GARFIELD_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,13 +51,11 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_GARFIELD_WS_SECRET}@${ZIRCUIT_GARFIELD_ETH_STATS_SERVER}:${ZIRCUIT_GARFIELD_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-us.garfield-testnet.zircuit.com?token=drpcV4hDaEwatB9G3zgk8gBkaH5s4TVMGeuUvlBIiVTD
       - GETH_TXPOOL_GLOBALQUEUE=1024
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=full
@@ -65,7 +63,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=garfield
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -108,7 +105,7 @@ services:
       - traefik.http.routers.zircuit-garfield-op-geth-pruned-pebble-path.middlewares=zircuit-garfield-op-geth-pruned-pebble-path-stripprefix, ipallowlist
 
   zircuit-garfield-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${GARFIELD_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_GARFIELD_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     ports:
       - 15072:15072
       - 15072:15072/udp
@@ -126,7 +123,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=garfield
+      - OP_NODE_NETWORK=zircuit-garfield
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
       - OP_NODE_P2P_LISTEN_TCP_PORT=15072
@@ -135,10 +132,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/zircuit-mainnet-op-geth-archive-leveldb-hash.yml
index 6cf2bf1c..d39725ba 100644
--- a/op/geth/zircuit-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/zircuit-mainnet-op-geth-archive-leveldb-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-mainnet-archive:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${MAINNET_GETH_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_MAINNET_GETH_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,14 +51,12 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_MAINNET_WS_SECRET}@${ZIRCUIT_MAINNET_ETH_STATS_SERVER}:${ZIRCUIT_MAINNET_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-eu.mainnet.zircuit.com/?token=drpcvATEn3gsYCLyLw7ztFLCBwQNoDJr2QjpcsNNkksu
       - GETH_TXPOOL_GLOBALQUEUE=1024
       - ZIRCUIT_NETWORK=mainnet
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=leveldb
       - --gcmode=archive
@@ -66,7 +64,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=mainnet
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -109,7 +106,7 @@ services:
       - traefik.http.routers.zircuit-mainnet-op-geth-archive-leveldb-hash.middlewares=zircuit-mainnet-op-geth-archive-leveldb-hash-stripprefix, ipallowlist
 
   zircuit-mainnet-archive-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${MAINNET_NODE_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_MAINNET_NODE_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
     ports:
       - 19463:19463
       - 19463:19463/udp
@@ -127,7 +124,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=mainnet
+      - OP_NODE_NETWORK=zircuit-mainnet
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
       - OP_NODE_P2P_LISTEN_TCP_PORT=19463
@@ -136,10 +133,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-mainnet-op-geth-archive-pebble-hash.yml b/op/geth/zircuit-mainnet-op-geth-archive-pebble-hash.yml
index f49ce957..000cd4a5 100644
--- a/op/geth/zircuit-mainnet-op-geth-archive-pebble-hash.yml
+++ b/op/geth/zircuit-mainnet-op-geth-archive-pebble-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-mainnet-archive:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${MAINNET_GETH_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_MAINNET_GETH_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,14 +51,12 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_MAINNET_WS_SECRET}@${ZIRCUIT_MAINNET_ETH_STATS_SERVER}:${ZIRCUIT_MAINNET_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-eu.mainnet.zircuit.com/?token=drpcvATEn3gsYCLyLw7ztFLCBwQNoDJr2QjpcsNNkksu
       - GETH_TXPOOL_GLOBALQUEUE=1024
       - ZIRCUIT_NETWORK=mainnet
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=archive
@@ -66,7 +64,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=mainnet
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -109,7 +106,7 @@ services:
       - traefik.http.routers.zircuit-mainnet-op-geth-archive-pebble-hash.middlewares=zircuit-mainnet-op-geth-archive-pebble-hash-stripprefix, ipallowlist
 
   zircuit-mainnet-archive-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${MAINNET_NODE_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_MAINNET_NODE_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
     ports:
       - 15588:15588
       - 15588:15588/udp
@@ -127,7 +124,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=mainnet
+      - OP_NODE_NETWORK=zircuit-mainnet
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
       - OP_NODE_P2P_LISTEN_TCP_PORT=15588
@@ -136,10 +133,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-mainnet-op-geth-pruned-pebble-hash.yml b/op/geth/zircuit-mainnet-op-geth-pruned-pebble-hash.yml
index 9e7ae920..08276408 100644
--- a/op/geth/zircuit-mainnet-op-geth-pruned-pebble-hash.yml
+++ b/op/geth/zircuit-mainnet-op-geth-pruned-pebble-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-mainnet:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${MAINNET_GETH_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_MAINNET_GETH_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,14 +51,12 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_MAINNET_WS_SECRET}@${ZIRCUIT_MAINNET_ETH_STATS_SERVER}:${ZIRCUIT_MAINNET_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-eu.mainnet.zircuit.com/?token=drpcvATEn3gsYCLyLw7ztFLCBwQNoDJr2QjpcsNNkksu
       - GETH_TXPOOL_GLOBALQUEUE=1024
       - ZIRCUIT_NETWORK=mainnet
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=full
@@ -66,7 +64,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=mainnet
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -109,7 +106,7 @@ services:
       - traefik.http.routers.zircuit-mainnet-op-geth-pruned-pebble-hash.middlewares=zircuit-mainnet-op-geth-pruned-pebble-hash-stripprefix, ipallowlist
 
   zircuit-mainnet-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${MAINNET_NODE_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_MAINNET_NODE_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
     ports:
       - 18688:18688
       - 18688:18688/udp
@@ -127,7 +124,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=mainnet
+      - OP_NODE_NETWORK=zircuit-mainnet
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
       - OP_NODE_P2P_LISTEN_TCP_PORT=18688
@@ -136,10 +133,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-mainnet-op-geth-pruned-pebble-path.yml b/op/geth/zircuit-mainnet-op-geth-pruned-pebble-path.yml
index 693c9bd8..9a19d459 100644
--- a/op/geth/zircuit-mainnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/zircuit-mainnet-op-geth-pruned-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-mainnet:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${MAINNET_GETH_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_MAINNET_GETH_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,14 +51,12 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_MAINNET_WS_SECRET}@${ZIRCUIT_MAINNET_ETH_STATS_SERVER}:${ZIRCUIT_MAINNET_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-eu.mainnet.zircuit.com/?token=drpcvATEn3gsYCLyLw7ztFLCBwQNoDJr2QjpcsNNkksu
       - GETH_TXPOOL_GLOBALQUEUE=1024
       - ZIRCUIT_NETWORK=mainnet
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=full
@@ -66,7 +64,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=mainnet
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -109,7 +106,7 @@ services:
       - traefik.http.routers.zircuit-mainnet-op-geth-pruned-pebble-path.middlewares=zircuit-mainnet-op-geth-pruned-pebble-path-stripprefix, ipallowlist
 
   zircuit-mainnet-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${MAINNET_NODE_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_MAINNET_NODE_VERSION:-8974a953936d3e5d5159db7b9e2d0a58dbaab5b0}
     ports:
       - 18359:18359
       - 18359:18359/udp
@@ -127,7 +124,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=mainnet
+      - OP_NODE_NETWORK=zircuit-mainnet
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
       - OP_NODE_P2P_LISTEN_TCP_PORT=18359
@@ -136,10 +133,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-testnet-op-geth-archive-leveldb-hash.yml b/op/geth/zircuit-testnet-op-geth-archive-leveldb-hash.yml
index 831a361c..0047b600 100644
--- a/op/geth/zircuit-testnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/zircuit-testnet-op-geth-archive-leveldb-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-testnet-archive:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${TESTNET_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_TESTNET_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,13 +51,11 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_TESTNET_WS_SECRET}@${ZIRCUIT_TESTNET_ETH_STATS_SERVER}:${ZIRCUIT_TESTNET_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-us.testnet.zircuit.com/?token=Drpc6dqvgakKRmtx4EVJxA89AxCk7wxB4dZAdDrgk
       - GETH_TXPOOL_GLOBALQUEUE=1024
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=leveldb
       - --gcmode=archive
@@ -65,7 +63,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=testnet
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -108,7 +105,7 @@ services:
       - traefik.http.routers.zircuit-testnet-op-geth-archive-leveldb-hash.middlewares=zircuit-testnet-op-geth-archive-leveldb-hash-stripprefix, ipallowlist
 
   zircuit-testnet-archive-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${TESTNET_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_TESTNET_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     ports:
       - 18095:18095
       - 18095:18095/udp
@@ -126,7 +123,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=testnet
+      - OP_NODE_NETWORK=zircuit-testnet
       - OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
@@ -136,10 +133,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-testnet-op-geth-archive-pebble-hash.yml b/op/geth/zircuit-testnet-op-geth-archive-pebble-hash.yml
index 9dc1c267..ba15341a 100644
--- a/op/geth/zircuit-testnet-op-geth-archive-pebble-hash.yml
+++ b/op/geth/zircuit-testnet-op-geth-archive-pebble-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-testnet-archive:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${TESTNET_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_TESTNET_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,13 +51,11 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_TESTNET_WS_SECRET}@${ZIRCUIT_TESTNET_ETH_STATS_SERVER}:${ZIRCUIT_TESTNET_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-us.testnet.zircuit.com/?token=Drpc6dqvgakKRmtx4EVJxA89AxCk7wxB4dZAdDrgk
       - GETH_TXPOOL_GLOBALQUEUE=1024
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=archive
@@ -65,7 +63,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=testnet
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -108,7 +105,7 @@ services:
       - traefik.http.routers.zircuit-testnet-op-geth-archive-pebble-hash.middlewares=zircuit-testnet-op-geth-archive-pebble-hash-stripprefix, ipallowlist
 
   zircuit-testnet-archive-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${TESTNET_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_TESTNET_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     ports:
       - 16499:16499
       - 16499:16499/udp
@@ -126,7 +123,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=testnet
+      - OP_NODE_NETWORK=zircuit-testnet
       - OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
@@ -136,10 +133,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-testnet-op-geth-pruned-pebble-hash.yml b/op/geth/zircuit-testnet-op-geth-pruned-pebble-hash.yml
index a3a254d3..3bd837af 100644
--- a/op/geth/zircuit-testnet-op-geth-pruned-pebble-hash.yml
+++ b/op/geth/zircuit-testnet-op-geth-pruned-pebble-hash.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-testnet:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${TESTNET_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_TESTNET_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,13 +51,11 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_TESTNET_WS_SECRET}@${ZIRCUIT_TESTNET_ETH_STATS_SERVER}:${ZIRCUIT_TESTNET_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-us.testnet.zircuit.com/?token=Drpc6dqvgakKRmtx4EVJxA89AxCk7wxB4dZAdDrgk
       - GETH_TXPOOL_GLOBALQUEUE=1024
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=full
@@ -65,7 +63,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=testnet
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -108,7 +105,7 @@ services:
       - traefik.http.routers.zircuit-testnet-op-geth-pruned-pebble-hash.middlewares=zircuit-testnet-op-geth-pruned-pebble-hash-stripprefix, ipallowlist
 
   zircuit-testnet-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${TESTNET_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_TESTNET_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     ports:
       - 16357:16357
       - 16357:16357/udp
@@ -126,7 +123,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=testnet
+      - OP_NODE_NETWORK=zircuit-testnet
       - OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
@@ -136,10 +133,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/op/geth/zircuit-testnet-op-geth-pruned-pebble-path.yml b/op/geth/zircuit-testnet-op-geth-pruned-pebble-path.yml
index 3954d429..aaa6a90e 100644
--- a/op/geth/zircuit-testnet-op-geth-pruned-pebble-path.yml
+++ b/op/geth/zircuit-testnet-op-geth-pruned-pebble-path.yml
@@ -30,7 +30,7 @@ x-logging-defaults: &logging-defaults
 
 services:
   zircuit-testnet:
-    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${TESTNET_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_GETH_IMAGE:-zircuit1/l2-geth}:${ZIRCUIT_TESTNET_GETH_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -51,13 +51,11 @@ services:
       - 8551
     environment:
       - GETH_CONFIG=/config/gethconfig.toml
-      - GETH_ETHSTATS=d${DOMAIN}:${ZIRCUIT_TESTNET_WS_SECRET}@${ZIRCUIT_TESTNET_ETH_STATS_SERVER}:${ZIRCUIT_TESTNET_ETH_STATS_SERVER_PORT}
       - GETH_ROLLUP_DISABLETXPOOLGOSSIP=true
       - GETH_ROLLUP_SEQUENCERHTTP=https://proxyd-ingress-us.testnet.zircuit.com/?token=Drpc6dqvgakKRmtx4EVJxA89AxCk7wxB4dZAdDrgk
       - GETH_TXPOOL_GLOBALQUEUE=1024
     entrypoint: /bin/sh -c 'exec geth "$@"' --
     command:
-      - --circuit-capacity-check=false
       - --datadir=/data
       - --db.engine=pebble
       - --gcmode=full
@@ -65,7 +63,6 @@ services:
       - --metrics
       - --metrics.addr=0.0.0.0
       - --metrics.port=6060
-      - --network=testnet
       - --nodiscover
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
@@ -108,7 +105,7 @@ services:
       - traefik.http.routers.zircuit-testnet-op-geth-pruned-pebble-path.middlewares=zircuit-testnet-op-geth-pruned-pebble-path-stripprefix, ipallowlist
 
   zircuit-testnet-node:
-    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${TESTNET_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
+    image: ${ZIRCUIT_NODE_IMAGE:-zircuit1/op-node}:${ZIRCUIT_TESTNET_NODE_VERSION:-e81568966f2a42a57b1347fb1dffdd5257dde73a}
     ports:
       - 17804:17804
       - 17804:17804/udp
@@ -126,7 +123,7 @@ services:
       - OP_NODE_METRICS_ENABLED=true
       - OP_NODE_METRICS_PORT=7300
       - OP_NODE_METRIC_ENABLED=true
-      - OP_NODE_NETWORK=testnet
+      - OP_NODE_NETWORK=zircuit-testnet
       - OP_NODE_OVERRIDE_PECTRABLOBSCHEDULE=1742486400
       - OP_NODE_P2P_ADVERTISE_IP=${IP}
       - OP_NODE_P2P_LISTEN_IP=0.0.0.0
@@ -136,10 +133,6 @@ services:
       - OP_NODE_ROLLUP_LOAD_PROTOCOL_VERSIONS=true
       - OP_NODE_RPC_ADDR=0.0.0.0
       - OP_NODE_RPC_PORT=8545
-      - OP_NODE_SEQUENCER_ENABLED=false
-      - OP_NODE_SEQUENCER_L1_CONFS=0
-      - OP_NODE_SEQUENCER_MAX_SAFE_LAG=0
-      - OP_NODE_SEQUENCER_STOPPED=false
       - OP_NODE_SNAPSHOT_LOG=/tmp/op-node-snapshot-log
       - OP_NODE_SYNCMODE=consensus-layer
       - OP_NODE_VERIFIER_L1_CONFS=0
diff --git a/polygon/bor/polygon-mainnet-bor-pruned-pebble-path--fireeth.yml b/polygon/bor/polygon-mainnet-bor-pruned-pebble-path--fireeth.yml
index 08f48017..dd657fe7 100644
--- a/polygon/bor/polygon-mainnet-bor-pruned-pebble-path--fireeth.yml
+++ b/polygon/bor/polygon-mainnet-bor-pruned-pebble-path--fireeth.yml
@@ -112,6 +112,8 @@ services:
       - ${POLYGON_MAINNET_FIREETH_BLOCKS_STORE:-/app/firehose-data/storage/merged-blocks}
     entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start firehose index-builder relayer merger $@, _]
     command:
+      - --firehose-rate-limit-bucket-fill-rate=${POLYGON_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_FILL_RATE:-1s}
+      - --firehose-rate-limit-bucket-size=${POLYGON_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_SIZE:-200}
       - --log-to-file=false
       - --relayer-source=polygon-mainnet:10010
     restart: unless-stopped
@@ -141,7 +143,9 @@ services:
     command:
       - --common-live-blocks-addr=polygon-mainnet-firehose:10014
       - --log-to-file=false
+      - --substreams-block-execution-timeout=${POLYGON_MAINNET_SUBSTREAMS_BLOCK_EXECUTION_TIMEOUT:-30m0s}
       - --substreams-rpc-endpoints=${POLYGON_MAINNET_EXECUTION_ARCHIVE_RPC}
+      - --substreams-tier1-max-subrequests=${POLYGON_MAINNET_SUBSTREAMS_TIER1_MAX_SUBREQUESTS:-20}
     restart: unless-stopped
     depends_on:
       - polygon-mainnet
diff --git a/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml b/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
index 38366954..0be5b2d7 100644
--- a/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
+++ b/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
@@ -131,6 +131,8 @@ services:
       - ${SOLANA_MAINNET_FIRESOL_BLOCKS_STORE:-/app/firehose-data/storage/merged-blocks}
     entrypoint: [sh, -c, exec firesol --config-file="" --log-to-file=false start firehose index-builder relayer merger $@, _]
     command:
+      - --firehose-rate-limit-bucket-fill-rate=${SOLANA_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_FILL_RATE:-1s}
+      - --firehose-rate-limit-bucket-size=${SOLANA_MAINNET_FIREHOSE_RATE_LIMIT_BUCKET_SIZE:-200}
       - --log-to-file=false
       - --relayer-source=solana-mainnet-agave-client:10010
     restart: unless-stopped
@@ -160,7 +162,9 @@ services:
     command:
       - --common-live-blocks-addr=solana-mainnet-agave-firehose:10014
       - --log-to-file=false
+      - --substreams-block-execution-timeout=${SOLANA_MAINNET_SUBSTREAMS_BLOCK_EXECUTION_TIMEOUT:-30m0s}
       - --substreams-rpc-endpoints=${SOLANA_MAINNET_EXECUTION_ARCHIVE_RPC}
+      - --substreams-tier1-max-subrequests=${SOLANA_MAINNET_SUBSTREAMS_TIER1_MAX_SUBREQUESTS:-20}
     restart: unless-stopped
     depends_on:
       - solana-mainnet-agave
diff --git a/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml b/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
index a4b85ef8..ef892990 100644
--- a/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
+++ b/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
@@ -129,6 +129,8 @@ services:
       - ${SOLANA_TESTNET_FIRESOL_BLOCKS_STORE:-/app/firehose-data/storage/merged-blocks}
     entrypoint: [sh, -c, exec firesol --config-file="" --log-to-file=false start firehose index-builder relayer merger $@, _]
     command:
+      - --firehose-rate-limit-bucket-fill-rate=${SOLANA_TESTNET_FIREHOSE_RATE_LIMIT_BUCKET_FILL_RATE:-1s}
+      - --firehose-rate-limit-bucket-size=${SOLANA_TESTNET_FIREHOSE_RATE_LIMIT_BUCKET_SIZE:-200}
       - --log-to-file=false
       - --relayer-source=solana-testnet-agave-client:10010
     restart: unless-stopped
@@ -158,7 +160,9 @@ services:
     command:
       - --common-live-blocks-addr=solana-testnet-agave-firehose:10014
       - --log-to-file=false
+      - --substreams-block-execution-timeout=${SOLANA_TESTNET_SUBSTREAMS_BLOCK_EXECUTION_TIMEOUT:-30m0s}
       - --substreams-rpc-endpoints=${SOLANA_TESTNET_EXECUTION_ARCHIVE_RPC}
+      - --substreams-tier1-max-subrequests=${SOLANA_TESTNET_SUBSTREAMS_TIER1_MAX_SUBREQUESTS:-20}
     restart: unless-stopped
     depends_on:
       - solana-testnet-agave