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 e703d7f7..5896e5ca 100644
--- a/arb/nitro/arbitrum-one-nitro-pruned-pebble-hash--fireeth.yml
+++ b/arb/nitro/arbitrum-one-nitro-pruned-pebble-hash--fireeth.yml
@@ -133,7 +133,7 @@ services:
     command:
       - --common-live-blocks-addr=http://arbitrum-one-firehose:10014
       - --log-to-file=false
-      - --substreams-rpc-endpoints=${ARBITRUM_ONE_FIREETH_ARCHIVE_RPC}
+      - --substreams-rpc-endpoints=${ARBITRUM_ONE_EXECUTION_ARCHIVE_RPC}
     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 7b0d650d..c8a0f69b 100644
--- a/bsc/bsc/bsc-mainnet-bsc-pruned-pebble-path--fireeth.yml
+++ b/bsc/bsc/bsc-mainnet-bsc-pruned-pebble-path--fireeth.yml
@@ -139,7 +139,7 @@ services:
     command:
       - --common-live-blocks-addr=http://bsc-mainnet-firehose:10014
       - --log-to-file=false
-      - --substreams-rpc-endpoints=${BSC_MAINNET_FIREETH_ARCHIVE_RPC}
+      - --substreams-rpc-endpoints=${BSC_MAINNET_EXECUTION_ARCHIVE_RPC}
     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 01807ddb..435b4ea3 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
@@ -142,7 +142,7 @@ services:
     command:
       - --common-live-blocks-addr=http://ethereum-mainnet-geth-firehose:10014
       - --log-to-file=false
-      - --substreams-rpc-endpoints=${ETHEREUM_MAINNET_FIREETH_ARCHIVE_RPC}
+      - --substreams-rpc-endpoints=${ETHEREUM_MAINNET_EXECUTION_ARCHIVE_RPC}
     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 1c3be801..74238af7 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
@@ -142,7 +142,7 @@ services:
     command:
       - --common-live-blocks-addr=http://ethereum-mainnet-geth-firehose:10014
       - --log-to-file=false
-      - --substreams-rpc-endpoints=${ETHEREUM_MAINNET_FIREETH_ARCHIVE_RPC}
+      - --substreams-rpc-endpoints=${ETHEREUM_MAINNET_EXECUTION_ARCHIVE_RPC}
     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 d5b511b9..8258a072 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
@@ -145,7 +145,7 @@ services:
     command:
       - --common-live-blocks-addr=http://base-mainnet-firehose:10014
       - --log-to-file=false
-      - --substreams-rpc-endpoints=${BASE_MAINNET_FIREETH_ARCHIVE_RPC}
+      - --substreams-rpc-endpoints=${BASE_MAINNET_EXECUTION_ARCHIVE_RPC}
     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 43ea4aab..713ca01b 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
@@ -146,7 +146,7 @@ services:
     command:
       - --common-live-blocks-addr=http://op-mainnet-firehose:10014
       - --log-to-file=false
-      - --substreams-rpc-endpoints=${OP_MAINNET_FIREETH_ARCHIVE_RPC}
+      - --substreams-rpc-endpoints=${OP_MAINNET_EXECUTION_ARCHIVE_RPC}
     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 7a8819ca..72f6dd13 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
@@ -145,7 +145,7 @@ services:
     command:
       - --common-live-blocks-addr=http://unichain-mainnet-firehose:10014
       - --log-to-file=false
-      - --substreams-rpc-endpoints=${UNICHAIN_MAINNET_FIREETH_ARCHIVE_RPC}
+      - --substreams-rpc-endpoints=${UNICHAIN_MAINNET_EXECUTION_ARCHIVE_RPC}
     restart: unless-stopped
     depends_on:
       - unichain-mainnet
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 70831948..fd487c3d 100644
--- a/polygon/bor/polygon-mainnet-bor-pruned-pebble-path--fireeth.yml
+++ b/polygon/bor/polygon-mainnet-bor-pruned-pebble-path--fireeth.yml
@@ -140,7 +140,7 @@ services:
     command:
       - --common-live-blocks-addr=http://polygon-mainnet-firehose:10014
       - --log-to-file=false
-      - --substreams-rpc-endpoints=${POLYGON_MAINNET_FIREETH_ARCHIVE_RPC}
+      - --substreams-rpc-endpoints=${POLYGON_MAINNET_EXECUTION_ARCHIVE_RPC}
     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 702f66dc..ea7f11f7 100644
--- a/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
+++ b/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
@@ -159,7 +159,7 @@ services:
     command:
       - --common-live-blocks-addr=http://solana-mainnet-agave-firehose:10014
       - --log-to-file=false
-      - --substreams-rpc-endpoints=${SOLANA_MAINNET_FIRESOL_ARCHIVE_RPC}
+      - --substreams-rpc-endpoints=${SOLANA_MAINNET_EXECUTION_ARCHIVE_RPC}
     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 6121aaab..908da80d 100644
--- a/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
+++ b/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
@@ -157,7 +157,7 @@ services:
     command:
       - --common-live-blocks-addr=http://solana-testnet-agave-firehose:10014
       - --log-to-file=false
-      - --substreams-rpc-endpoints=${SOLANA_TESTNET_FIRESOL_ARCHIVE_RPC}
+      - --substreams-rpc-endpoints=${SOLANA_TESTNET_EXECUTION_ARCHIVE_RPC}
     restart: unless-stopped
     depends_on:
       - solana-testnet-agave