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 82fa7dae..a5054d01 100644
--- a/arb/nitro/arbitrum-one-nitro-pruned-pebble-hash--fireeth.yml
+++ b/arb/nitro/arbitrum-one-nitro-pruned-pebble-hash--fireeth.yml
@@ -129,7 +129,7 @@ services:
     image: ${ARBITRUM_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${ARBITRUM_ONE_FIREETH_VERSION:-v2.11.7-nitro-nitro-v3.5.5-fh3.0}
     expose:
       - 10016
-    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier-1 substreams-tier-2 $@, _]
+    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier1 substreams-tier2 $@, _]
     command:
       - --common-live-blocks-addr=http://arbitrum-one-firehose:10014
       - --log-to-file=false
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 a44adc0c..5a737429 100644
--- a/bsc/bsc/bsc-mainnet-bsc-pruned-pebble-path--fireeth.yml
+++ b/bsc/bsc/bsc-mainnet-bsc-pruned-pebble-path--fireeth.yml
@@ -136,7 +136,7 @@ services:
     image: ${BSC_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${BSC_MAINNET_FIREETH_VERSION:-v2.11.9-bnb}
     expose:
       - 10016
-    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier-1 substreams-tier-2 $@, _]
+    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier1 substreams-tier2 $@, _]
     command:
       - --common-live-blocks-addr=http://bsc-mainnet-firehose:10014
       - --log-to-file=false
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 8cb4b1bb..886da247 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
@@ -139,7 +139,7 @@ services:
     image: ${ETHEREUM_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${ETHEREUM_MAINNET_FIREETH_VERSION:-v2.11.9-geth-v1.15.10-fh3.0-2}
     expose:
       - 10016
-    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier-1 substreams-tier-2 $@, _]
+    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier1 substreams-tier2 $@, _]
     command:
       - --common-live-blocks-addr=http://ethereum-mainnet-geth-firehose:10014
       - --log-to-file=false
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 7edc1a7f..8840e5e7 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
@@ -139,7 +139,7 @@ services:
     image: ${ETHEREUM_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${ETHEREUM_MAINNET_FIREETH_VERSION:-v2.11.9-geth-v1.15.10-fh3.0-2}
     expose:
       - 10016
-    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier-1 substreams-tier-2 $@, _]
+    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier1 substreams-tier2 $@, _]
     command:
       - --common-live-blocks-addr=http://ethereum-mainnet-geth-firehose:10014
       - --log-to-file=false
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 7825ad38..dd1a1359 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
@@ -142,7 +142,7 @@ services:
     image: ${BASE_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${BASE_MAINNET_FIREETH_VERSION:-v2.11.9-optimism-v1.101503.4-op-node.v1.13.2}
     expose:
       - 10016
-    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier-1 substreams-tier-2 $@, _]
+    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier1 substreams-tier2 $@, _]
     command:
       - --common-live-blocks-addr=http://base-mainnet-firehose:10014
       - --log-to-file=false
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 b4990667..1df541e7 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
@@ -143,7 +143,7 @@ services:
     image: ${OP_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${OP_MAINNET_FIREETH_VERSION:-v2.11.9-optimism-v1.101503.4-op-node.v1.13.2}
     expose:
       - 10016
-    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier-1 substreams-tier-2 $@, _]
+    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier1 substreams-tier2 $@, _]
     command:
       - --common-live-blocks-addr=http://op-mainnet-firehose:10014
       - --log-to-file=false
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 a144ab66..0b907280 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
@@ -142,7 +142,7 @@ services:
     image: ${UNICHAIN_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${UNICHAIN_MAINNET_FIREETH_VERSION:-v2.11.9-optimism-v1.101503.4-op-node.v1.13.2}
     expose:
       - 10016
-    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier-1 substreams-tier-2 $@, _]
+    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier1 substreams-tier2 $@, _]
     command:
       - --common-live-blocks-addr=http://unichain-mainnet-firehose:10014
       - --log-to-file=false
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 3b42ed94..93581e53 100644
--- a/polygon/bor/polygon-mainnet-bor-pruned-pebble-path--fireeth.yml
+++ b/polygon/bor/polygon-mainnet-bor-pruned-pebble-path--fireeth.yml
@@ -137,7 +137,7 @@ services:
     image: ${POLYGON_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${POLYGON_MAINNET_FIREETH_VERSION:-v2.11.9-polygon-v1.4.1-fh2.4-3}
     expose:
       - 10016
-    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier-1 substreams-tier-2 $@, _]
+    entrypoint: [sh, -c, exec fireeth --config-file="" --log-to-file=false start substreams-tier1 substreams-tier2 $@, _]
     command:
       - --common-live-blocks-addr=http://polygon-mainnet-firehose:10014
       - --log-to-file=false
diff --git a/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml b/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
index fb113565..868cbed5 100644
--- a/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
+++ b/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
@@ -155,7 +155,7 @@ services:
     image: ${SOLANA_FIRESOL_IMAGE:-ghcr.io/streamingfast/firehose-solana}:${SOLANA_MAINNET_FIRESOL_VERSION:-v1.1.3}
     expose:
       - 10016
-    entrypoint: [sh, -c, exec firesol --config-file="" --log-to-file=false start substreams-tier-1 substreams-tier-2 $@, _]
+    entrypoint: [sh, -c, exec firesol --config-file="" --log-to-file=false start substreams-tier1 substreams-tier2 $@, _]
     command:
       - --common-live-blocks-addr=http://solana-mainnet-agave-firehose:10014
       - --log-to-file=false
diff --git a/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml b/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
index ca36b08d..bde2fbb9 100644
--- a/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
+++ b/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
@@ -153,7 +153,7 @@ services:
     image: ${SOLANA_FIRESOL_IMAGE:-ghcr.io/streamingfast/firehose-solana}:${SOLANA_TESTNET_FIRESOL_VERSION:-v1.1.3}
     expose:
       - 10016
-    entrypoint: [sh, -c, exec firesol --config-file="" --log-to-file=false start substreams-tier-1 substreams-tier-2 $@, _]
+    entrypoint: [sh, -c, exec firesol --config-file="" --log-to-file=false start substreams-tier1 substreams-tier2 $@, _]
     command:
       - --common-live-blocks-addr=http://solana-testnet-agave-firehose:10014
       - --log-to-file=false