From 6e477bd5f01dfa7b58c2e05e106733b23e2f2d87 Mon Sep 17 00:00:00 2001
From: Para Dox <armhole.limeade_0l@icloud.com>
Date: Mon, 19 May 2025 13:05:42 +0700
Subject: [PATCH] renaming stuff

---
 ...itrum-one-arbnode-archive-leveldb-hash.yml | 10 ++---
 ...rbitrum-one-nitro-archive-leveldb-hash.yml |  3 +-
 .../berachain-bartio-reth-archive-trace.yml   | 16 ++++----
 .../berachain-bartio-reth-pruned-trace.yml    | 16 ++++----
 .../berachain-bepolia-reth-archive-trace.yml  | 16 ++++----
 .../berachain-bepolia-reth-pruned-trace.yml   | 16 ++++----
 .../berachain-mainnet-reth-archive-trace.yml  | 16 ++++----
 .../berachain-mainnet-reth-pruned-trace.yml   | 16 ++++----
 .../bsc-chapel-erigon3-archive-trace.yml      | 10 ++---
 .../bsc-chapel-erigon3-minimal-trace.yml      | 10 ++---
 .../bsc-chapel-erigon3-pruned-trace.yml       | 10 ++---
 .../bsc-mainnet-erigon3-archive-trace.yml     | 10 ++---
 .../bsc-mainnet-erigon3-minimal-trace.yml     | 10 ++---
 .../bsc-mainnet-erigon3-pruned-trace.yml      | 10 ++---
 .../ethereum-classic-besu-pruned-bonsai.yml   | 16 ++++----
 ...ethereum-holesky-erigon3-archive-trace.yml | 14 +++----
 ...ethereum-holesky-erigon3-minimal-trace.yml | 14 +++----
 .../ethereum-holesky-erigon3-pruned-trace.yml | 14 +++----
 .../ethereum-hoodi-erigon3-archive-trace.yml  | 14 +++----
 .../ethereum-hoodi-erigon3-minimal-trace.yml  | 14 +++----
 .../ethereum-hoodi-erigon3-pruned-trace.yml   | 14 +++----
 ...ethereum-mainnet-erigon3-archive-trace.yml | 14 +++----
 ...ethereum-mainnet-erigon3-minimal-trace.yml | 14 +++----
 .../ethereum-mainnet-erigon3-pruned-trace.yml | 14 +++----
 ...ethereum-sepolia-erigon3-archive-trace.yml | 14 +++----
 ...ethereum-sepolia-erigon3-minimal-trace.yml | 14 +++----
 .../ethereum-sepolia-erigon3-pruned-trace.yml | 14 +++----
 ...hereum-holesky-geth-pruned-pebble-path.yml | 22 +++++------
 ...h-pruned-leveldb-hash--nimbus--fireeth.yml | 38 +++++++++----------
 ...th-pruned-pebble-path--nimbus--fireeth.yml | 38 +++++++++----------
 ...hereum-mainnet-geth-pruned-pebble-path.yml | 22 +++++------
 ...hereum-sepolia-geth-pruned-pebble-path.yml | 22 +++++------
 .../ethereum-holesky-reth-archive-trace.yml   | 22 +++++------
 .../ethereum-holesky-reth-pruned-trace.yml    | 22 +++++------
 ...archive-trace--lighthouse-pruned-blobs.yml | 22 +++++------
 ...eum-mainnet-reth-archive-trace--nimbus.yml | 22 +++++------
 .../ethereum-mainnet-reth-archive-trace.yml   | 22 +++++------
 ...eum-mainnet-reth-minimal-trace--blsync.yml | 18 ++++-----
 ...eum-mainnet-reth-minimal-trace--nimbus.yml | 24 ++++++------
 ...reum-mainnet-reth-pruned-trace--nimbus.yml | 22 +++++------
 .../ethereum-mainnet-reth-pruned-trace.yml    | 22 +++++------
 .../ethereum-sepolia-reth-archive-trace.yml   | 22 +++++------
 .../ethereum-sepolia-reth-pruned-trace.yml    | 22 +++++------
 .../fantom-mainnet-opera-archive-trace.yml    | 10 ++---
 fantom/opera/fantom-mainnet-opera-archive.yml | 10 ++---
 .../fantom-mainnet-opera-pruned-trace.yml     | 10 ++---
 fantom/opera/fantom-mainnet-opera-pruned.yml  | 10 ++---
 .../fantom-testnet-opera-archive-trace.yml    | 10 ++---
 fantom/opera/fantom-testnet-opera-archive.yml | 10 ++---
 .../fantom-testnet-opera-pruned-trace.yml     | 10 ++---
 fantom/opera/fantom-testnet-opera-pruned.yml  | 10 ++---
 fantom/sonic/fantom-mainnet-sonic-archive.yml | 10 ++---
 fantom/sonic/fantom-testnet-sonic-archive.yml | 10 ++---
 .../gnosis-chiado-erigon3-archive-trace.yml   | 10 ++---
 .../gnosis-chiado-erigon3-minimal-trace.yml   | 10 ++---
 .../gnosis-chiado-erigon3-pruned-trace.yml    | 10 ++---
 .../gnosis-mainnet-erigon3-archive-trace.yml  | 10 ++---
 .../gnosis-mainnet-erigon3-minimal-trace.yml  | 10 ++---
 .../gnosis-mainnet-erigon3-pruned-trace.yml   | 10 ++---
 haqq/haqq/haqq-mainnet-haqq-pruned.yml        | 26 ++++++++++++-
 .../linea-mainnet-erigon3-archive-trace.yml   | 10 ++---
 .../linea-mainnet-erigon3-minimal-trace.yml   | 10 ++---
 .../linea-mainnet-erigon3-pruned-trace.yml    | 10 ++---
 .../linea-sepolia-erigon3-archive-trace.yml   | 10 ++---
 .../linea-sepolia-erigon3-minimal-trace.yml   | 10 ++---
 .../linea-sepolia-erigon3-pruned-trace.yml    | 10 ++---
 .../base-mainnet-op-erigon-archive-trace.yml  | 16 ++++----
 .../base-sepolia-op-erigon-archive-trace.yml  | 16 ++++----
 .../bob-mainnet-op-erigon-archive-trace.yml   | 16 ++++----
 .../boba-mainnet-op-erigon-archive-trace.yml  | 16 ++++----
 ...ychain-mainnet-op-erigon-archive-trace.yml | 16 ++++----
 .../ink-mainnet-op-erigon-archive-trace.yml   | 16 ++++----
 .../ink-sepolia-op-erigon-archive-trace.yml   | 16 ++++----
 .../lisk-mainnet-op-erigon-archive-trace.yml  | 16 ++++----
 .../metal-mainnet-op-erigon-archive-trace.yml | 16 ++++----
 .../mode-mainnet-op-erigon-archive-trace.yml  | 16 ++++----
 .../mode-sepolia-op-erigon-archive-trace.yml  | 16 ++++----
 .../op-mainnet-op-erigon-archive-trace.yml    | 21 +++++-----
 .../op-sepolia-op-erigon-archive-trace.yml    | 16 ++++----
 .../snax-mainnet-op-erigon-archive-trace.yml  | 16 ++++----
 ...soneium-minato-op-erigon-archive-trace.yml | 16 ++++----
 .../swell-mainnet-op-erigon-archive-trace.yml | 16 ++++----
 ...ichain-mainnet-op-erigon-archive-trace.yml | 16 ++++----
 ...ichain-sepolia-op-erigon-archive-trace.yml | 16 ++++----
 ...dchain-mainnet-op-erigon-archive-trace.yml | 16 ++++----
 ...dchain-sepolia-op-erigon-archive-trace.yml | 16 ++++----
 .../zora-mainnet-op-erigon-archive-trace.yml  | 16 ++++----
 .../zora-sepolia-op-erigon-archive-trace.yml  | 16 ++++----
 ...alfajores-op-geth-archive-leveldb-hash.yml |  3 --
 ...-alfajores-op-geth-pruned-leveldb-hash.yml |  3 --
 ...o-mainnet-op-geth-archive-leveldb-hash.yml |  3 --
 ...lo-mainnet-op-geth-pruned-leveldb-hash.yml |  3 --
 ...p-mainnet-op-geth-archive-leveldb-hash.yml |  5 +--
 ...op-mainnet-l2geth-archive-leveldb-hash.yml | 10 ++---
 .../base-mainnet-op-reth-archive-trace.yml    | 16 ++++----
 ...innet-op-reth-minimal-trace--benchmark.yml | 22 +++++------
 .../base-mainnet-op-reth-minimal-trace.yml    | 16 ++++----
 ...ainnet-op-reth-pruned-trace--benchmark.yml | 22 +++++------
 op/reth/base-mainnet-op-reth-pruned-trace.yml | 16 ++++----
 .../base-sepolia-op-reth-archive-trace.yml    | 16 ++++----
 .../base-sepolia-op-reth-minimal-trace.yml    | 16 ++++----
 op/reth/base-sepolia-op-reth-pruned-trace.yml | 16 ++++----
 .../lisk-mainnet-op-reth-archive-trace.yml    | 16 ++++----
 op/reth/lisk-mainnet-op-reth-pruned-trace.yml | 16 ++++----
 op/reth/op-mainnet-op-reth-archive-trace.yml  | 16 ++++----
 op/reth/op-mainnet-op-reth-minimal-trace.yml  | 16 ++++----
 op/reth/op-mainnet-op-reth-pruned-trace.yml   | 16 ++++----
 op/reth/op-sepolia-op-reth-archive-trace.yml  | 16 ++++----
 op/reth/op-sepolia-op-reth-minimal-trace.yml  | 16 ++++----
 op/reth/op-sepolia-op-reth-pruned-trace.yml   | 16 ++++----
 .../polygon-amoy-erigon3-archive-trace.yml    | 10 ++---
 .../polygon-amoy-erigon3-minimal-trace.yml    | 10 ++---
 .../polygon-amoy-erigon3-pruned-trace.yml     | 10 ++---
 .../polygon-mainnet-erigon3-archive-trace.yml | 10 ++---
 .../polygon-mainnet-erigon3-minimal-trace.yml | 10 ++---
 .../polygon-mainnet-erigon3-pruned-trace.yml  | 10 ++---
 .../rskj/rootstock-bamboo-rskj-archive.yml    | 16 ++++----
 .../rskj/rootstock-mainnet-rskj-archive.yml   | 16 ++++----
 ...-mainnet-agave-pruned-rocksdb--firesol.yml | 32 ++++++++--------
 ...-testnet-agave-pruned-rocksdb--firesol.yml | 32 ++++++++--------
 sonic/sonic/sonic-mainnet-sonic-archive.yml   | 10 ++---
 ...tion-mainnet-node-archive-leveldb-hash.yml | 16 ++++----
 ...ction-mainnet-node-pruned-leveldb-hash.yml | 16 ++++----
 ...tion-testnet-node-archive-leveldb-hash.yml | 16 ++++----
 ...ction-testnet-node-pruned-leveldb-hash.yml | 16 ++++----
 125 files changed, 933 insertions(+), 930 deletions(-)

diff --git a/arb/arbnode/arbitrum-one-arbnode-archive-leveldb-hash.yml b/arb/arbnode/arbitrum-one-arbnode-archive-leveldb-hash.yml
index b41c39b3..9880625e 100644
--- a/arb/arbnode/arbitrum-one-arbnode-archive-leveldb-hash.yml
+++ b/arb/arbnode/arbitrum-one-arbnode-archive-leveldb-hash.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/arbitrum-one-archive \
+# curl -X POST https://${IP}.traefik.me/arbitrum-one \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  arbitrum-one-archive:
+  arbitrum-one:
     image: ${ARBITRUM_ARBNODE_IMAGE:-offchainlabs/arb-node}:${ARBITRUM_ONE_ARBNODE_VERSION:-v1.4.5-e97c1a4}
     sysctls:
       # TCP Performance
@@ -78,12 +78,12 @@ services:
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.arbitrum-one-arbnode-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/arbitrum-one-archive
+      - traefik.http.middlewares.arbitrum-one-arbnode-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/arbitrum-one
       - traefik.http.services.arbitrum-one-arbnode-archive-leveldb-hash.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.arbitrum-one-arbnode-archive-leveldb-hash.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.arbitrum-one-arbnode-archive-leveldb-hash.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.arbitrum-one-arbnode-archive-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/arbitrum-one-archive`) || Path(`/arbitrum-one-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.arbitrum-one-arbnode-archive-leveldb-hash.rule=Path(`/arbitrum-one-archive`) || Path(`/arbitrum-one-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.arbitrum-one-arbnode-archive-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/arbitrum-one`) || Path(`/arbitrum-one/`))}
+      - ${NO_SSL:+traefik.http.routers.arbitrum-one-arbnode-archive-leveldb-hash.rule=Path(`/arbitrum-one`) || Path(`/arbitrum-one/`)}
       - traefik.http.routers.arbitrum-one-arbnode-archive-leveldb-hash.middlewares=arbitrum-one-arbnode-archive-leveldb-hash-stripprefix, ipallowlist
 
 volumes:
diff --git a/arb/nitro/arbitrum-one-nitro-archive-leveldb-hash.yml b/arb/nitro/arbitrum-one-nitro-archive-leveldb-hash.yml
index 7a44f4ad..bc46bd08 100644
--- a/arb/nitro/arbitrum-one-nitro-archive-leveldb-hash.yml
+++ b/arb/nitro/arbitrum-one-nitro-archive-leveldb-hash.yml
@@ -51,7 +51,6 @@ services:
       - --chain.id=42161
       - --execution.caching.archive=true
       - --execution.caching.state-scheme=hash
-      - --execution.rpc.classic-redirect=http://arbitrum-one-archive-classic:8545
       - --execution.rpc.gas-cap=600000000
       - --execution.sequencer.enable=false
       - --http.addr=0.0.0.0
@@ -96,7 +95,7 @@ services:
       - ${NO_SSL:+traefik.http.routers.arbitrum-one-nitro-archive-leveldb-hash.rule=Path(`/arbitrum-one-archive`) || Path(`/arbitrum-one-archive/`)}
       - traefik.http.routers.arbitrum-one-nitro-archive-leveldb-hash.middlewares=arbitrum-one-nitro-archive-leveldb-hash-stripprefix, ipallowlist
 
-  arbitrum-one-archive-classic:
+  arbitrum-one-classic:
     image: ${ARBITRUM_ARBNODE_IMAGE:-offchainlabs/arb-node}:${ARBITRUM_ONE_ARBNODE_VERSION:-v1.4.5-e97c1a4}
     sysctls:
       # TCP Performance
diff --git a/berachain/reth/berachain-bartio-reth-archive-trace.yml b/berachain/reth/berachain-bartio-reth-archive-trace.yml
index 736cf8e7..31b1bbaf 100644
--- a/berachain/reth/berachain-bartio-reth-archive-trace.yml
+++ b/berachain/reth/berachain-bartio-reth-archive-trace.yml
@@ -1,6 +1,6 @@
 ---
 # you should backup the peers of your beacond node frequently.
-# docker exec -it rpc-berachain-bartio-archive-node-1 curl http://localhost:26657/net_info | jq -r '
+# docker exec -it rpc-berachain-bartio-reth-node-1 curl http://localhost:26657/net_info | jq -r '
 #  .result.peers[]
 #  | "\(.node_info.id)@\(.remote_ip):\(.node_info.listen_addr | split(":") | last)"
 #' | paste -sd,
@@ -29,7 +29,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/berachain-bartio-archive \
+# curl -X POST https://${IP}.traefik.me/berachain-bartio-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -39,7 +39,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  berachain-bartio-archive:
+  berachain-bartio-reth:
     image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${BERACHAIN_BARTIO_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -113,16 +113,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.berachain-bartio-reth-archive-trace-stripprefix.stripprefix.prefixes=/berachain-bartio-archive
+      - traefik.http.middlewares.berachain-bartio-reth-archive-trace-stripprefix.stripprefix.prefixes=/berachain-bartio-reth
       - traefik.http.services.berachain-bartio-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.berachain-bartio-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.berachain-bartio-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.berachain-bartio-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-bartio-archive`) || Path(`/berachain-bartio-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.berachain-bartio-reth-archive-trace.rule=Path(`/berachain-bartio-archive`) || Path(`/berachain-bartio-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.berachain-bartio-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-bartio-reth`) || Path(`/berachain-bartio-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.berachain-bartio-reth-archive-trace.rule=Path(`/berachain-bartio-reth`) || Path(`/berachain-bartio-reth/`)}
       - traefik.http.routers.berachain-bartio-reth-archive-trace.middlewares=berachain-bartio-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  berachain-bartio-archive-node:
+  berachain-bartio-reth-node:
     build:
       context: ./berachain
       dockerfile: beacon-kit.Dockerfile
@@ -133,7 +133,7 @@ services:
       - 15527:15527
       - 15527:15527/udp
     environment:
-      - AUTH_RPC=http://berachain-bartio-archive:8551
+      - AUTH_RPC=http://berachain-bartio-reth:8551
       - CHAINID=80084
       - CHAINNAME=bartio
       - CHAIN_SPEC=testnet
diff --git a/berachain/reth/berachain-bartio-reth-pruned-trace.yml b/berachain/reth/berachain-bartio-reth-pruned-trace.yml
index 6a02aec1..255e8cef 100644
--- a/berachain/reth/berachain-bartio-reth-pruned-trace.yml
+++ b/berachain/reth/berachain-bartio-reth-pruned-trace.yml
@@ -1,6 +1,6 @@
 ---
 # you should backup the peers of your beacond node frequently.
-# docker exec -it rpc-berachain-bartio-node-1 curl http://localhost:26657/net_info | jq -r '
+# docker exec -it rpc-berachain-bartio-reth-pruned-node-1 curl http://localhost:26657/net_info | jq -r '
 #  .result.peers[]
 #  | "\(.node_info.id)@\(.remote_ip):\(.node_info.listen_addr | split(":") | last)"
 #' | paste -sd,
@@ -29,7 +29,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/berachain-bartio \
+# curl -X POST https://${IP}.traefik.me/berachain-bartio-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -39,7 +39,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  berachain-bartio:
+  berachain-bartio-reth-pruned:
     image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${BERACHAIN_BARTIO_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -114,16 +114,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.berachain-bartio-reth-pruned-trace-stripprefix.stripprefix.prefixes=/berachain-bartio
+      - traefik.http.middlewares.berachain-bartio-reth-pruned-trace-stripprefix.stripprefix.prefixes=/berachain-bartio-reth-pruned
       - traefik.http.services.berachain-bartio-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.berachain-bartio-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.berachain-bartio-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.berachain-bartio-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-bartio`) || Path(`/berachain-bartio/`))}
-      - ${NO_SSL:+traefik.http.routers.berachain-bartio-reth-pruned-trace.rule=Path(`/berachain-bartio`) || Path(`/berachain-bartio/`)}
+      - ${NO_SSL:-traefik.http.routers.berachain-bartio-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-bartio-reth-pruned`) || Path(`/berachain-bartio-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.berachain-bartio-reth-pruned-trace.rule=Path(`/berachain-bartio-reth-pruned`) || Path(`/berachain-bartio-reth-pruned/`)}
       - traefik.http.routers.berachain-bartio-reth-pruned-trace.middlewares=berachain-bartio-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  berachain-bartio-node:
+  berachain-bartio-reth-pruned-node:
     build:
       context: ./berachain
       dockerfile: beacon-kit.Dockerfile
@@ -134,7 +134,7 @@ services:
       - 19467:19467
       - 19467:19467/udp
     environment:
-      - AUTH_RPC=http://berachain-bartio:8551
+      - AUTH_RPC=http://berachain-bartio-reth-pruned:8551
       - CHAINID=80084
       - CHAINNAME=bartio
       - CHAIN_SPEC=testnet
diff --git a/berachain/reth/berachain-bepolia-reth-archive-trace.yml b/berachain/reth/berachain-bepolia-reth-archive-trace.yml
index 21708d0c..c61c9ffa 100644
--- a/berachain/reth/berachain-bepolia-reth-archive-trace.yml
+++ b/berachain/reth/berachain-bepolia-reth-archive-trace.yml
@@ -1,6 +1,6 @@
 ---
 # you should backup the peers of your beacond node frequently.
-# docker exec -it rpc-berachain-bepolia-archive-node-1 curl http://localhost:26657/net_info | jq -r '
+# docker exec -it rpc-berachain-bepolia-reth-node-1 curl http://localhost:26657/net_info | jq -r '
 #  .result.peers[]
 #  | "\(.node_info.id)@\(.remote_ip):\(.node_info.listen_addr | split(":") | last)"
 #' | paste -sd,
@@ -29,7 +29,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/berachain-bepolia-archive \
+# curl -X POST https://${IP}.traefik.me/berachain-bepolia-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -39,7 +39,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  berachain-bepolia-archive:
+  berachain-bepolia-reth:
     image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${BERACHAIN_BEPOLIA_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -114,16 +114,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.berachain-bepolia-reth-archive-trace-stripprefix.stripprefix.prefixes=/berachain-bepolia-archive
+      - traefik.http.middlewares.berachain-bepolia-reth-archive-trace-stripprefix.stripprefix.prefixes=/berachain-bepolia-reth
       - traefik.http.services.berachain-bepolia-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.berachain-bepolia-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.berachain-bepolia-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.berachain-bepolia-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-bepolia-archive`) || Path(`/berachain-bepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.berachain-bepolia-reth-archive-trace.rule=Path(`/berachain-bepolia-archive`) || Path(`/berachain-bepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.berachain-bepolia-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-bepolia-reth`) || Path(`/berachain-bepolia-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.berachain-bepolia-reth-archive-trace.rule=Path(`/berachain-bepolia-reth`) || Path(`/berachain-bepolia-reth/`)}
       - traefik.http.routers.berachain-bepolia-reth-archive-trace.middlewares=berachain-bepolia-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  berachain-bepolia-archive-node:
+  berachain-bepolia-reth-node:
     build:
       context: ./berachain
       dockerfile: beacon-kit.Dockerfile
@@ -134,7 +134,7 @@ services:
       - 16347:16347
       - 16347:16347/udp
     environment:
-      - AUTH_RPC=http://berachain-bepolia-archive:8551
+      - AUTH_RPC=http://berachain-bepolia-reth:8551
       - CHAINID=80069
       - CHAINNAME=bepolia
       - CHAIN_SPEC=testnet
diff --git a/berachain/reth/berachain-bepolia-reth-pruned-trace.yml b/berachain/reth/berachain-bepolia-reth-pruned-trace.yml
index 1509ccd6..cc2d4543 100644
--- a/berachain/reth/berachain-bepolia-reth-pruned-trace.yml
+++ b/berachain/reth/berachain-bepolia-reth-pruned-trace.yml
@@ -1,6 +1,6 @@
 ---
 # you should backup the peers of your beacond node frequently.
-# docker exec -it rpc-berachain-bepolia-node-1 curl http://localhost:26657/net_info | jq -r '
+# docker exec -it rpc-berachain-bepolia-reth-pruned-node-1 curl http://localhost:26657/net_info | jq -r '
 #  .result.peers[]
 #  | "\(.node_info.id)@\(.remote_ip):\(.node_info.listen_addr | split(":") | last)"
 #' | paste -sd,
@@ -29,7 +29,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/berachain-bepolia \
+# curl -X POST https://${IP}.traefik.me/berachain-bepolia-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -39,7 +39,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  berachain-bepolia:
+  berachain-bepolia-reth-pruned:
     image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${BERACHAIN_BEPOLIA_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -115,16 +115,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.berachain-bepolia-reth-pruned-trace-stripprefix.stripprefix.prefixes=/berachain-bepolia
+      - traefik.http.middlewares.berachain-bepolia-reth-pruned-trace-stripprefix.stripprefix.prefixes=/berachain-bepolia-reth-pruned
       - traefik.http.services.berachain-bepolia-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.berachain-bepolia-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.berachain-bepolia-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.berachain-bepolia-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-bepolia`) || Path(`/berachain-bepolia/`))}
-      - ${NO_SSL:+traefik.http.routers.berachain-bepolia-reth-pruned-trace.rule=Path(`/berachain-bepolia`) || Path(`/berachain-bepolia/`)}
+      - ${NO_SSL:-traefik.http.routers.berachain-bepolia-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-bepolia-reth-pruned`) || Path(`/berachain-bepolia-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.berachain-bepolia-reth-pruned-trace.rule=Path(`/berachain-bepolia-reth-pruned`) || Path(`/berachain-bepolia-reth-pruned/`)}
       - traefik.http.routers.berachain-bepolia-reth-pruned-trace.middlewares=berachain-bepolia-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  berachain-bepolia-node:
+  berachain-bepolia-reth-pruned-node:
     build:
       context: ./berachain
       dockerfile: beacon-kit.Dockerfile
@@ -135,7 +135,7 @@ services:
       - 17274:17274
       - 17274:17274/udp
     environment:
-      - AUTH_RPC=http://berachain-bepolia:8551
+      - AUTH_RPC=http://berachain-bepolia-reth-pruned:8551
       - CHAINID=80069
       - CHAINNAME=bepolia
       - CHAIN_SPEC=testnet
diff --git a/berachain/reth/berachain-mainnet-reth-archive-trace.yml b/berachain/reth/berachain-mainnet-reth-archive-trace.yml
index 927cac40..3a77a1f9 100644
--- a/berachain/reth/berachain-mainnet-reth-archive-trace.yml
+++ b/berachain/reth/berachain-mainnet-reth-archive-trace.yml
@@ -1,6 +1,6 @@
 ---
 # you should backup the peers of your beacond node frequently.
-# docker exec -it rpc-berachain-mainnet-archive-node-1 curl http://localhost:26657/net_info | jq -r '
+# docker exec -it rpc-berachain-mainnet-reth-node-1 curl http://localhost:26657/net_info | jq -r '
 #  .result.peers[]
 #  | "\(.node_info.id)@\(.remote_ip):\(.node_info.listen_addr | split(":") | last)"
 #' | paste -sd,
@@ -29,7 +29,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/berachain-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/berachain-mainnet-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -39,7 +39,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  berachain-mainnet-archive:
+  berachain-mainnet-reth:
     image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${BERACHAIN_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -114,16 +114,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.berachain-mainnet-reth-archive-trace-stripprefix.stripprefix.prefixes=/berachain-mainnet-archive
+      - traefik.http.middlewares.berachain-mainnet-reth-archive-trace-stripprefix.stripprefix.prefixes=/berachain-mainnet-reth
       - traefik.http.services.berachain-mainnet-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.berachain-mainnet-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.berachain-mainnet-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.berachain-mainnet-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-mainnet-archive`) || Path(`/berachain-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.berachain-mainnet-reth-archive-trace.rule=Path(`/berachain-mainnet-archive`) || Path(`/berachain-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.berachain-mainnet-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-mainnet-reth`) || Path(`/berachain-mainnet-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.berachain-mainnet-reth-archive-trace.rule=Path(`/berachain-mainnet-reth`) || Path(`/berachain-mainnet-reth/`)}
       - traefik.http.routers.berachain-mainnet-reth-archive-trace.middlewares=berachain-mainnet-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  berachain-mainnet-archive-node:
+  berachain-mainnet-reth-node:
     build:
       context: ./berachain
       dockerfile: beacon-kit.Dockerfile
@@ -134,7 +134,7 @@ services:
       - 17881:17881
       - 17881:17881/udp
     environment:
-      - AUTH_RPC=http://berachain-mainnet-archive:8551
+      - AUTH_RPC=http://berachain-mainnet-reth:8551
       - CHAINID=80094
       - CHAINNAME=mainnet
       - CHAIN_SPEC=mainnet
diff --git a/berachain/reth/berachain-mainnet-reth-pruned-trace.yml b/berachain/reth/berachain-mainnet-reth-pruned-trace.yml
index a739d7e9..55f5375e 100644
--- a/berachain/reth/berachain-mainnet-reth-pruned-trace.yml
+++ b/berachain/reth/berachain-mainnet-reth-pruned-trace.yml
@@ -1,6 +1,6 @@
 ---
 # you should backup the peers of your beacond node frequently.
-# docker exec -it rpc-berachain-mainnet-node-1 curl http://localhost:26657/net_info | jq -r '
+# docker exec -it rpc-berachain-mainnet-reth-pruned-node-1 curl http://localhost:26657/net_info | jq -r '
 #  .result.peers[]
 #  | "\(.node_info.id)@\(.remote_ip):\(.node_info.listen_addr | split(":") | last)"
 #' | paste -sd,
@@ -29,7 +29,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/berachain-mainnet \
+# curl -X POST https://${IP}.traefik.me/berachain-mainnet-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -39,7 +39,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  berachain-mainnet:
+  berachain-mainnet-reth-pruned:
     image: ${BERACHAIN_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${BERACHAIN_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -115,16 +115,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.berachain-mainnet-reth-pruned-trace-stripprefix.stripprefix.prefixes=/berachain-mainnet
+      - traefik.http.middlewares.berachain-mainnet-reth-pruned-trace-stripprefix.stripprefix.prefixes=/berachain-mainnet-reth-pruned
       - traefik.http.services.berachain-mainnet-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.berachain-mainnet-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.berachain-mainnet-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.berachain-mainnet-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-mainnet`) || Path(`/berachain-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.berachain-mainnet-reth-pruned-trace.rule=Path(`/berachain-mainnet`) || Path(`/berachain-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.berachain-mainnet-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/berachain-mainnet-reth-pruned`) || Path(`/berachain-mainnet-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.berachain-mainnet-reth-pruned-trace.rule=Path(`/berachain-mainnet-reth-pruned`) || Path(`/berachain-mainnet-reth-pruned/`)}
       - traefik.http.routers.berachain-mainnet-reth-pruned-trace.middlewares=berachain-mainnet-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  berachain-mainnet-node:
+  berachain-mainnet-reth-pruned-node:
     build:
       context: ./berachain
       dockerfile: beacon-kit.Dockerfile
@@ -135,7 +135,7 @@ services:
       - 15900:15900
       - 15900:15900/udp
     environment:
-      - AUTH_RPC=http://berachain-mainnet:8551
+      - AUTH_RPC=http://berachain-mainnet-reth-pruned:8551
       - CHAINID=80094
       - CHAINNAME=mainnet
       - CHAIN_SPEC=mainnet
diff --git a/bsc/erigon3/bsc-chapel-erigon3-archive-trace.yml b/bsc/erigon3/bsc-chapel-erigon3-archive-trace.yml
index 16fd2338..bc44e2cc 100644
--- a/bsc/erigon3/bsc-chapel-erigon3-archive-trace.yml
+++ b/bsc/erigon3/bsc-chapel-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/bsc-chapel-archive \
+# curl -X POST https://${IP}.traefik.me/bsc-chapel-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  bsc-chapel-archive:
+  bsc-chapel-erigon3-archive:
     image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_CHAPEL_ERIGON3_VERSION:-v1.3.6}
     sysctls:
       # TCP Performance
@@ -91,12 +91,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.bsc-chapel-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/bsc-chapel-archive
+      - traefik.http.middlewares.bsc-chapel-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/bsc-chapel-erigon3-archive
       - traefik.http.services.bsc-chapel-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-chapel-archive`) || Path(`/bsc-chapel-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.bsc-chapel-erigon3-archive-trace.rule=Path(`/bsc-chapel-archive`) || Path(`/bsc-chapel-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-chapel-erigon3-archive`) || Path(`/bsc-chapel-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.bsc-chapel-erigon3-archive-trace.rule=Path(`/bsc-chapel-erigon3-archive`) || Path(`/bsc-chapel-erigon3-archive/`)}
       - traefik.http.routers.bsc-chapel-erigon3-archive-trace.middlewares=bsc-chapel-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/bsc/erigon3/bsc-chapel-erigon3-minimal-trace.yml b/bsc/erigon3/bsc-chapel-erigon3-minimal-trace.yml
index 69ea3798..cbf3bf9b 100644
--- a/bsc/erigon3/bsc-chapel-erigon3-minimal-trace.yml
+++ b/bsc/erigon3/bsc-chapel-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/bsc-chapel-minimal \
+# curl -X POST https://${IP}.traefik.me/bsc-chapel-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  bsc-chapel-minimal:
+  bsc-chapel-erigon3-minimal:
     image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_CHAPEL_ERIGON3_VERSION:-v1.3.6}
     sysctls:
       # TCP Performance
@@ -91,12 +91,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.bsc-chapel-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/bsc-chapel-minimal
+      - traefik.http.middlewares.bsc-chapel-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/bsc-chapel-erigon3-minimal
       - traefik.http.services.bsc-chapel-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-chapel-minimal`) || Path(`/bsc-chapel-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.bsc-chapel-erigon3-minimal-trace.rule=Path(`/bsc-chapel-minimal`) || Path(`/bsc-chapel-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-chapel-erigon3-minimal`) || Path(`/bsc-chapel-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.bsc-chapel-erigon3-minimal-trace.rule=Path(`/bsc-chapel-erigon3-minimal`) || Path(`/bsc-chapel-erigon3-minimal/`)}
       - traefik.http.routers.bsc-chapel-erigon3-minimal-trace.middlewares=bsc-chapel-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/bsc/erigon3/bsc-chapel-erigon3-pruned-trace.yml b/bsc/erigon3/bsc-chapel-erigon3-pruned-trace.yml
index 57cc4b21..c8bb8eac 100644
--- a/bsc/erigon3/bsc-chapel-erigon3-pruned-trace.yml
+++ b/bsc/erigon3/bsc-chapel-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/bsc-chapel \
+# curl -X POST https://${IP}.traefik.me/bsc-chapel-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  bsc-chapel:
+  bsc-chapel-erigon3:
     image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_CHAPEL_ERIGON3_VERSION:-v1.3.6}
     sysctls:
       # TCP Performance
@@ -91,12 +91,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.bsc-chapel-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/bsc-chapel
+      - traefik.http.middlewares.bsc-chapel-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/bsc-chapel-erigon3
       - traefik.http.services.bsc-chapel-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-chapel`) || Path(`/bsc-chapel/`))}
-      - ${NO_SSL:+traefik.http.routers.bsc-chapel-erigon3-pruned-trace.rule=Path(`/bsc-chapel`) || Path(`/bsc-chapel/`)}
+      - ${NO_SSL:-traefik.http.routers.bsc-chapel-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-chapel-erigon3`) || Path(`/bsc-chapel-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.bsc-chapel-erigon3-pruned-trace.rule=Path(`/bsc-chapel-erigon3`) || Path(`/bsc-chapel-erigon3/`)}
       - traefik.http.routers.bsc-chapel-erigon3-pruned-trace.middlewares=bsc-chapel-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/bsc/erigon3/bsc-mainnet-erigon3-archive-trace.yml b/bsc/erigon3/bsc-mainnet-erigon3-archive-trace.yml
index bdbe479c..fa1971ab 100644
--- a/bsc/erigon3/bsc-mainnet-erigon3-archive-trace.yml
+++ b/bsc/erigon3/bsc-mainnet-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/bsc-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/bsc-mainnet-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  bsc-mainnet-archive:
+  bsc-mainnet-erigon3-archive:
     image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_MAINNET_ERIGON3_VERSION:-v1.3.6}
     sysctls:
       # TCP Performance
@@ -91,12 +91,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.bsc-mainnet-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/bsc-mainnet-archive
+      - traefik.http.middlewares.bsc-mainnet-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/bsc-mainnet-erigon3-archive
       - traefik.http.services.bsc-mainnet-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-mainnet-archive`) || Path(`/bsc-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.bsc-mainnet-erigon3-archive-trace.rule=Path(`/bsc-mainnet-archive`) || Path(`/bsc-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-mainnet-erigon3-archive`) || Path(`/bsc-mainnet-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.bsc-mainnet-erigon3-archive-trace.rule=Path(`/bsc-mainnet-erigon3-archive`) || Path(`/bsc-mainnet-erigon3-archive/`)}
       - traefik.http.routers.bsc-mainnet-erigon3-archive-trace.middlewares=bsc-mainnet-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/bsc/erigon3/bsc-mainnet-erigon3-minimal-trace.yml b/bsc/erigon3/bsc-mainnet-erigon3-minimal-trace.yml
index 48441bee..6a95a310 100644
--- a/bsc/erigon3/bsc-mainnet-erigon3-minimal-trace.yml
+++ b/bsc/erigon3/bsc-mainnet-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/bsc-mainnet-minimal \
+# curl -X POST https://${IP}.traefik.me/bsc-mainnet-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  bsc-mainnet-minimal:
+  bsc-mainnet-erigon3-minimal:
     image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_MAINNET_ERIGON3_VERSION:-v1.3.6}
     sysctls:
       # TCP Performance
@@ -91,12 +91,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.bsc-mainnet-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/bsc-mainnet-minimal
+      - traefik.http.middlewares.bsc-mainnet-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/bsc-mainnet-erigon3-minimal
       - traefik.http.services.bsc-mainnet-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-mainnet-minimal`) || Path(`/bsc-mainnet-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.bsc-mainnet-erigon3-minimal-trace.rule=Path(`/bsc-mainnet-minimal`) || Path(`/bsc-mainnet-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-mainnet-erigon3-minimal`) || Path(`/bsc-mainnet-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.bsc-mainnet-erigon3-minimal-trace.rule=Path(`/bsc-mainnet-erigon3-minimal`) || Path(`/bsc-mainnet-erigon3-minimal/`)}
       - traefik.http.routers.bsc-mainnet-erigon3-minimal-trace.middlewares=bsc-mainnet-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/bsc/erigon3/bsc-mainnet-erigon3-pruned-trace.yml b/bsc/erigon3/bsc-mainnet-erigon3-pruned-trace.yml
index 77d5cf11..9037e30f 100644
--- a/bsc/erigon3/bsc-mainnet-erigon3-pruned-trace.yml
+++ b/bsc/erigon3/bsc-mainnet-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/bsc-mainnet \
+# curl -X POST https://${IP}.traefik.me/bsc-mainnet-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  bsc-mainnet:
+  bsc-mainnet-erigon3:
     image: ${BSC_ERIGON3_IMAGE:-ghcr.io/node-real/bsc-erigon}:${BSC_MAINNET_ERIGON3_VERSION:-v1.3.6}
     sysctls:
       # TCP Performance
@@ -91,12 +91,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.bsc-mainnet-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/bsc-mainnet
+      - traefik.http.middlewares.bsc-mainnet-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/bsc-mainnet-erigon3
       - traefik.http.services.bsc-mainnet-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-mainnet`) || Path(`/bsc-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.bsc-mainnet-erigon3-pruned-trace.rule=Path(`/bsc-mainnet`) || Path(`/bsc-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.bsc-mainnet-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/bsc-mainnet-erigon3`) || Path(`/bsc-mainnet-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.bsc-mainnet-erigon3-pruned-trace.rule=Path(`/bsc-mainnet-erigon3`) || Path(`/bsc-mainnet-erigon3/`)}
       - traefik.http.routers.bsc-mainnet-erigon3-pruned-trace.middlewares=bsc-mainnet-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/besu/ethereum-classic-besu-pruned-bonsai.yml b/ethereum/besu/ethereum-classic-besu-pruned-bonsai.yml
index ff714ad9..9905bdd7 100644
--- a/ethereum/besu/ethereum-classic-besu-pruned-bonsai.yml
+++ b/ethereum/besu/ethereum-classic-besu-pruned-bonsai.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-classic \
+# curl -X POST https://${IP}.traefik.me/ethereum-classic-besu \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-classic-client:
+  ethereum-classic-besu-client:
     image: ${ETHEREUM_BESU_IMAGE:-hyperledger/besu}:${ETHEREUM_CLASSIC_BESU_VERSION:-25.4.1}
     sysctls:
       # TCP Performance
@@ -87,19 +87,19 @@ services:
       - prometheus-scrape.port=9545
       - prometheus-scrape.path=/metrics
 
-  ethereum-classic:
+  ethereum-classic-besu:
     image: nginx
     expose:
       - '80'
     environment:
-      PROXY_HOST: ethereum-classic-client
+      PROXY_HOST: ethereum-classic-besu-client
       RPC_PATH: ''
       RPC_PORT: 8545
       WS_PATH: ''
       WS_PORT: 8546
     restart: unless-stopped
     depends_on:
-      - ethereum-classic-client
+      - ethereum-classic-besu-client
     networks:
       - chains
     volumes:
@@ -108,12 +108,12 @@ services:
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-classic-besu-pruned-bonsai-stripprefix.stripprefix.prefixes=/ethereum-classic
+      - traefik.http.middlewares.ethereum-classic-besu-pruned-bonsai-stripprefix.stripprefix.prefixes=/ethereum-classic-besu
       - traefik.http.services.ethereum-classic-besu-pruned-bonsai.loadbalancer.server.port=80
       - ${NO_SSL:-traefik.http.routers.ethereum-classic-besu-pruned-bonsai.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-classic-besu-pruned-bonsai.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-classic-besu-pruned-bonsai.rule=Host(`$DOMAIN`) && (Path(`/ethereum-classic`) || Path(`/ethereum-classic/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-classic-besu-pruned-bonsai.rule=Path(`/ethereum-classic`) || Path(`/ethereum-classic/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-classic-besu-pruned-bonsai.rule=Host(`$DOMAIN`) && (Path(`/ethereum-classic-besu`) || Path(`/ethereum-classic-besu/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-classic-besu-pruned-bonsai.rule=Path(`/ethereum-classic-besu`) || Path(`/ethereum-classic-besu/`)}
       - traefik.http.routers.ethereum-classic-besu-pruned-bonsai.middlewares=ethereum-classic-besu-pruned-bonsai-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/erigon3/ethereum-holesky-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-holesky-erigon3-archive-trace.yml
index a7041e4b..40968360 100644
--- a/ethereum/erigon3/ethereum-holesky-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-holesky-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-holesky-archive \
+# curl -X POST https://${IP}.traefik.me/ethereum-holesky-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-holesky-archive:
+  ethereum-holesky-erigon3-archive:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOLESKY_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-holesky-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-holesky-archive
+      - traefik.http.middlewares.ethereum-holesky-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-holesky-erigon3-archive
       - traefik.http.services.ethereum-holesky-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky-archive`) || Path(`/ethereum-holesky-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-archive-trace.rule=Path(`/ethereum-holesky-archive`) || Path(`/ethereum-holesky-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky-erigon3-archive`) || Path(`/ethereum-holesky-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-archive-trace.rule=Path(`/ethereum-holesky-erigon3-archive`) || Path(`/ethereum-holesky-erigon3-archive/`)}
       - traefik.http.routers.ethereum-holesky-erigon3-archive-trace.middlewares=ethereum-holesky-erigon3-archive-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-holesky-erigon3-archive-trace.service=ethereum-holesky-erigon3-archive-trace
       - traefik.http.routers.ethereum-holesky-erigon3-archive-trace-node.service=ethereum-holesky-erigon3-archive-trace-node
       - traefik.http.services.ethereum-holesky-erigon3-archive-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-archive-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky-archive/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-archive-trace-node.rule=PathPrefix(`/ethereum-holesky-archive/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky-erigon3-archive/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-archive-trace-node.rule=PathPrefix(`/ethereum-holesky-erigon3-archive/eth`)}
       - traefik.http.routers.ethereum-holesky-erigon3-archive-trace-node.middlewares=ethereum-holesky-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-holesky-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-holesky-erigon3-minimal-trace.yml
index 78618d05..db171ce8 100644
--- a/ethereum/erigon3/ethereum-holesky-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-holesky-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-holesky-minimal \
+# curl -X POST https://${IP}.traefik.me/ethereum-holesky-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-holesky-minimal:
+  ethereum-holesky-erigon3-minimal:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOLESKY_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-holesky-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-holesky-minimal
+      - traefik.http.middlewares.ethereum-holesky-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-holesky-erigon3-minimal
       - traefik.http.services.ethereum-holesky-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky-minimal`) || Path(`/ethereum-holesky-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-minimal-trace.rule=Path(`/ethereum-holesky-minimal`) || Path(`/ethereum-holesky-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky-erigon3-minimal`) || Path(`/ethereum-holesky-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-minimal-trace.rule=Path(`/ethereum-holesky-erigon3-minimal`) || Path(`/ethereum-holesky-erigon3-minimal/`)}
       - traefik.http.routers.ethereum-holesky-erigon3-minimal-trace.middlewares=ethereum-holesky-erigon3-minimal-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-holesky-erigon3-minimal-trace.service=ethereum-holesky-erigon3-minimal-trace
       - traefik.http.routers.ethereum-holesky-erigon3-minimal-trace-node.service=ethereum-holesky-erigon3-minimal-trace-node
       - traefik.http.services.ethereum-holesky-erigon3-minimal-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-minimal-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-minimal-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-minimal-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky-minimal/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-minimal-trace-node.rule=PathPrefix(`/ethereum-holesky-minimal/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-minimal-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky-erigon3-minimal/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-minimal-trace-node.rule=PathPrefix(`/ethereum-holesky-erigon3-minimal/eth`)}
       - traefik.http.routers.ethereum-holesky-erigon3-minimal-trace-node.middlewares=ethereum-holesky-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-holesky-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-holesky-erigon3-pruned-trace.yml
index f25e4369..2711f81d 100644
--- a/ethereum/erigon3/ethereum-holesky-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-holesky-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-holesky \
+# curl -X POST https://${IP}.traefik.me/ethereum-holesky-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-holesky:
+  ethereum-holesky-erigon3:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOLESKY_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-holesky-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-holesky
+      - traefik.http.middlewares.ethereum-holesky-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-holesky-erigon3
       - traefik.http.services.ethereum-holesky-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky`) || Path(`/ethereum-holesky/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-pruned-trace.rule=Path(`/ethereum-holesky`) || Path(`/ethereum-holesky/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky-erigon3`) || Path(`/ethereum-holesky-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-pruned-trace.rule=Path(`/ethereum-holesky-erigon3`) || Path(`/ethereum-holesky-erigon3/`)}
       - traefik.http.routers.ethereum-holesky-erigon3-pruned-trace.middlewares=ethereum-holesky-erigon3-pruned-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-holesky-erigon3-pruned-trace.service=ethereum-holesky-erigon3-pruned-trace
       - traefik.http.routers.ethereum-holesky-erigon3-pruned-trace-node.service=ethereum-holesky-erigon3-pruned-trace-node
       - traefik.http.services.ethereum-holesky-erigon3-pruned-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-pruned-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-pruned-trace-node.rule=PathPrefix(`/ethereum-holesky/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-erigon3-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky-erigon3/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-erigon3-pruned-trace-node.rule=PathPrefix(`/ethereum-holesky-erigon3/eth`)}
       - traefik.http.routers.ethereum-holesky-erigon3-pruned-trace-node.middlewares=ethereum-holesky-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
index 7ad65f05..67bd2a1a 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-hoodi-archive \
+# curl -X POST https://${IP}.traefik.me/ethereum-hoodi-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-hoodi-archive:
+  ethereum-hoodi-erigon3-archive:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-hoodi-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-hoodi-archive
+      - traefik.http.middlewares.ethereum-hoodi-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-hoodi-erigon3-archive
       - traefik.http.services.ethereum-hoodi-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-hoodi-archive`) || Path(`/ethereum-hoodi-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-archive-trace.rule=Path(`/ethereum-hoodi-archive`) || Path(`/ethereum-hoodi-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-hoodi-erigon3-archive`) || Path(`/ethereum-hoodi-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-archive-trace.rule=Path(`/ethereum-hoodi-erigon3-archive`) || Path(`/ethereum-hoodi-erigon3-archive/`)}
       - traefik.http.routers.ethereum-hoodi-erigon3-archive-trace.middlewares=ethereum-hoodi-erigon3-archive-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-hoodi-erigon3-archive-trace.service=ethereum-hoodi-erigon3-archive-trace
       - traefik.http.routers.ethereum-hoodi-erigon3-archive-trace-node.service=ethereum-hoodi-erigon3-archive-trace-node
       - traefik.http.services.ethereum-hoodi-erigon3-archive-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-archive-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-hoodi-archive/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-archive-trace-node.rule=PathPrefix(`/ethereum-hoodi-archive/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-hoodi-erigon3-archive/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-archive-trace-node.rule=PathPrefix(`/ethereum-hoodi-erigon3-archive/eth`)}
       - traefik.http.routers.ethereum-hoodi-erigon3-archive-trace-node.middlewares=ethereum-hoodi-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
index a94de8f6..1597c4d2 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-hoodi-minimal \
+# curl -X POST https://${IP}.traefik.me/ethereum-hoodi-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-hoodi-minimal:
+  ethereum-hoodi-erigon3-minimal:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-hoodi-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-hoodi-minimal
+      - traefik.http.middlewares.ethereum-hoodi-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-hoodi-erigon3-minimal
       - traefik.http.services.ethereum-hoodi-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-hoodi-minimal`) || Path(`/ethereum-hoodi-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace.rule=Path(`/ethereum-hoodi-minimal`) || Path(`/ethereum-hoodi-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-hoodi-erigon3-minimal`) || Path(`/ethereum-hoodi-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace.rule=Path(`/ethereum-hoodi-erigon3-minimal`) || Path(`/ethereum-hoodi-erigon3-minimal/`)}
       - traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace.middlewares=ethereum-hoodi-erigon3-minimal-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace.service=ethereum-hoodi-erigon3-minimal-trace
       - traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace-node.service=ethereum-hoodi-erigon3-minimal-trace-node
       - traefik.http.services.ethereum-hoodi-erigon3-minimal-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-hoodi-minimal/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace-node.rule=PathPrefix(`/ethereum-hoodi-minimal/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-hoodi-erigon3-minimal/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace-node.rule=PathPrefix(`/ethereum-hoodi-erigon3-minimal/eth`)}
       - traefik.http.routers.ethereum-hoodi-erigon3-minimal-trace-node.middlewares=ethereum-hoodi-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
index 2748c5a0..52f49b53 100644
--- a/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-hoodi-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-hoodi \
+# curl -X POST https://${IP}.traefik.me/ethereum-hoodi-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-hoodi:
+  ethereum-hoodi-erigon3:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_HOODI_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-hoodi-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-hoodi
+      - traefik.http.middlewares.ethereum-hoodi-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-hoodi-erigon3
       - traefik.http.services.ethereum-hoodi-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-hoodi`) || Path(`/ethereum-hoodi/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace.rule=Path(`/ethereum-hoodi`) || Path(`/ethereum-hoodi/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-hoodi-erigon3`) || Path(`/ethereum-hoodi-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace.rule=Path(`/ethereum-hoodi-erigon3`) || Path(`/ethereum-hoodi-erigon3/`)}
       - traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace.middlewares=ethereum-hoodi-erigon3-pruned-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace.service=ethereum-hoodi-erigon3-pruned-trace
       - traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace-node.service=ethereum-hoodi-erigon3-pruned-trace-node
       - traefik.http.services.ethereum-hoodi-erigon3-pruned-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-hoodi/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace-node.rule=PathPrefix(`/ethereum-hoodi/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-hoodi-erigon3/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace-node.rule=PathPrefix(`/ethereum-hoodi-erigon3/eth`)}
       - traefik.http.routers.ethereum-hoodi-erigon3-pruned-trace-node.middlewares=ethereum-hoodi-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
index 1444514b..09c1943b 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet-archive:
+  ethereum-mainnet-erigon3-archive:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-archive
+      - traefik.http.middlewares.ethereum-mainnet-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-erigon3-archive
       - traefik.http.services.ethereum-mainnet-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-archive`) || Path(`/ethereum-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-archive-trace.rule=Path(`/ethereum-mainnet-archive`) || Path(`/ethereum-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-erigon3-archive`) || Path(`/ethereum-mainnet-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-archive-trace.rule=Path(`/ethereum-mainnet-erigon3-archive`) || Path(`/ethereum-mainnet-erigon3-archive/`)}
       - traefik.http.routers.ethereum-mainnet-erigon3-archive-trace.middlewares=ethereum-mainnet-erigon3-archive-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-mainnet-erigon3-archive-trace.service=ethereum-mainnet-erigon3-archive-trace
       - traefik.http.routers.ethereum-mainnet-erigon3-archive-trace-node.service=ethereum-mainnet-erigon3-archive-trace-node
       - traefik.http.services.ethereum-mainnet-erigon3-archive-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-archive-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-archive/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-archive-trace-node.rule=PathPrefix(`/ethereum-mainnet-archive/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-erigon3-archive/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-archive-trace-node.rule=PathPrefix(`/ethereum-mainnet-erigon3-archive/eth`)}
       - traefik.http.routers.ethereum-mainnet-erigon3-archive-trace-node.middlewares=ethereum-mainnet-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
index 7b3d0583..97827570 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-minimal \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet-minimal:
+  ethereum-mainnet-erigon3-minimal:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-minimal
+      - traefik.http.middlewares.ethereum-mainnet-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-erigon3-minimal
       - traefik.http.services.ethereum-mainnet-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-minimal`) || Path(`/ethereum-mainnet-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace.rule=Path(`/ethereum-mainnet-minimal`) || Path(`/ethereum-mainnet-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-erigon3-minimal`) || Path(`/ethereum-mainnet-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace.rule=Path(`/ethereum-mainnet-erigon3-minimal`) || Path(`/ethereum-mainnet-erigon3-minimal/`)}
       - traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace.middlewares=ethereum-mainnet-erigon3-minimal-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace.service=ethereum-mainnet-erigon3-minimal-trace
       - traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace-node.service=ethereum-mainnet-erigon3-minimal-trace-node
       - traefik.http.services.ethereum-mainnet-erigon3-minimal-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-minimal/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace-node.rule=PathPrefix(`/ethereum-mainnet-minimal/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-erigon3-minimal/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace-node.rule=PathPrefix(`/ethereum-mainnet-erigon3-minimal/eth`)}
       - traefik.http.routers.ethereum-mainnet-erigon3-minimal-trace-node.middlewares=ethereum-mainnet-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
index 7cb67e4a..61f191f9 100644
--- a/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-mainnet-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet:
+  ethereum-mainnet-erigon3:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-erigon3
       - traefik.http.services.ethereum-mainnet-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace.rule=Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-erigon3`) || Path(`/ethereum-mainnet-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace.rule=Path(`/ethereum-mainnet-erigon3`) || Path(`/ethereum-mainnet-erigon3/`)}
       - traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace.middlewares=ethereum-mainnet-erigon3-pruned-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace.service=ethereum-mainnet-erigon3-pruned-trace
       - traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace-node.service=ethereum-mainnet-erigon3-pruned-trace-node
       - traefik.http.services.ethereum-mainnet-erigon3-pruned-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace-node.rule=PathPrefix(`/ethereum-mainnet/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-erigon3/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace-node.rule=PathPrefix(`/ethereum-mainnet-erigon3/eth`)}
       - traefik.http.routers.ethereum-mainnet-erigon3-pruned-trace-node.middlewares=ethereum-mainnet-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml b/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
index 6f23f4cd..99367a33 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/ethereum-sepolia-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-sepolia-archive:
+  ethereum-sepolia-erigon3-archive:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-sepolia-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-sepolia-archive
+      - traefik.http.middlewares.ethereum-sepolia-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-sepolia-erigon3-archive
       - traefik.http.services.ethereum-sepolia-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia-archive`) || Path(`/ethereum-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-archive-trace.rule=Path(`/ethereum-sepolia-archive`) || Path(`/ethereum-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia-erigon3-archive`) || Path(`/ethereum-sepolia-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-archive-trace.rule=Path(`/ethereum-sepolia-erigon3-archive`) || Path(`/ethereum-sepolia-erigon3-archive/`)}
       - traefik.http.routers.ethereum-sepolia-erigon3-archive-trace.middlewares=ethereum-sepolia-erigon3-archive-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-sepolia-erigon3-archive-trace.service=ethereum-sepolia-erigon3-archive-trace
       - traefik.http.routers.ethereum-sepolia-erigon3-archive-trace-node.service=ethereum-sepolia-erigon3-archive-trace-node
       - traefik.http.services.ethereum-sepolia-erigon3-archive-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-archive-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia-archive/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-archive-trace-node.rule=PathPrefix(`/ethereum-sepolia-archive/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia-erigon3-archive/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-archive-trace-node.rule=PathPrefix(`/ethereum-sepolia-erigon3-archive/eth`)}
       - traefik.http.routers.ethereum-sepolia-erigon3-archive-trace-node.middlewares=ethereum-sepolia-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml b/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
index fd9a9c7c..90f2b5d7 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-sepolia-minimal \
+# curl -X POST https://${IP}.traefik.me/ethereum-sepolia-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-sepolia-minimal:
+  ethereum-sepolia-erigon3-minimal:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-sepolia-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-sepolia-minimal
+      - traefik.http.middlewares.ethereum-sepolia-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-sepolia-erigon3-minimal
       - traefik.http.services.ethereum-sepolia-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia-minimal`) || Path(`/ethereum-sepolia-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace.rule=Path(`/ethereum-sepolia-minimal`) || Path(`/ethereum-sepolia-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia-erigon3-minimal`) || Path(`/ethereum-sepolia-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace.rule=Path(`/ethereum-sepolia-erigon3-minimal`) || Path(`/ethereum-sepolia-erigon3-minimal/`)}
       - traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace.middlewares=ethereum-sepolia-erigon3-minimal-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace.service=ethereum-sepolia-erigon3-minimal-trace
       - traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace-node.service=ethereum-sepolia-erigon3-minimal-trace-node
       - traefik.http.services.ethereum-sepolia-erigon3-minimal-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia-minimal/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace-node.rule=PathPrefix(`/ethereum-sepolia-minimal/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia-erigon3-minimal/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace-node.rule=PathPrefix(`/ethereum-sepolia-erigon3-minimal/eth`)}
       - traefik.http.routers.ethereum-sepolia-erigon3-minimal-trace-node.middlewares=ethereum-sepolia-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml b/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
index 5d322263..b84066be 100644
--- a/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
+++ b/ethereum/erigon3/ethereum-sepolia-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-sepolia \
+# curl -X POST https://${IP}.traefik.me/ethereum-sepolia-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-sepolia:
+  ethereum-sepolia-erigon3:
     image: ${ETHEREUM_ERIGON3_IMAGE:-erigontech/erigon}:${ETHEREUM_SEPOLIA_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -103,20 +103,20 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-sepolia-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-sepolia
+      - traefik.http.middlewares.ethereum-sepolia-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-sepolia-erigon3
       - traefik.http.services.ethereum-sepolia-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia`) || Path(`/ethereum-sepolia/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace.rule=Path(`/ethereum-sepolia`) || Path(`/ethereum-sepolia/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia-erigon3`) || Path(`/ethereum-sepolia-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace.rule=Path(`/ethereum-sepolia-erigon3`) || Path(`/ethereum-sepolia-erigon3/`)}
       - traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace.middlewares=ethereum-sepolia-erigon3-pruned-trace-stripprefix, ipallowlist
       - traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace.service=ethereum-sepolia-erigon3-pruned-trace
       - traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace-node.service=ethereum-sepolia-erigon3-pruned-trace-node
       - traefik.http.services.ethereum-sepolia-erigon3-pruned-trace-node.loadbalancer.server.port=5555
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace-node.rule=PathPrefix(`/ethereum-sepolia/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia-erigon3/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace-node.rule=PathPrefix(`/ethereum-sepolia-erigon3/eth`)}
       - traefik.http.routers.ethereum-sepolia-erigon3-pruned-trace-node.middlewares=ethereum-sepolia-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/ethereum/geth/ethereum-holesky-geth-pruned-pebble-path.yml b/ethereum/geth/ethereum-holesky-geth-pruned-pebble-path.yml
index 22fde72c..5f07e4ce 100644
--- a/ethereum/geth/ethereum-holesky-geth-pruned-pebble-path.yml
+++ b/ethereum/geth/ethereum-holesky-geth-pruned-pebble-path.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-holesky \
+# curl -X POST https://${IP}.traefik.me/ethereum-holesky-geth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-holesky:
+  ethereum-holesky-geth:
     image: ${ETHEREUM_GETH_IMAGE:-ethereum/client-go}:${ETHEREUM_HOLESKY_GETH_VERSION:-v1.15.7}
     sysctls:
       # TCP Performance
@@ -94,15 +94,15 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-holesky-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/ethereum-holesky
+      - traefik.http.middlewares.ethereum-holesky-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/ethereum-holesky-geth
       - traefik.http.services.ethereum-holesky-geth-pruned-pebble-path.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky`) || Path(`/ethereum-holesky/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path.rule=Path(`/ethereum-holesky`) || Path(`/ethereum-holesky/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky-geth`) || Path(`/ethereum-holesky-geth/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path.rule=Path(`/ethereum-holesky-geth`) || Path(`/ethereum-holesky-geth/`)}
       - traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path.middlewares=ethereum-holesky-geth-pruned-pebble-path-stripprefix, ipallowlist
 
-  ethereum-holesky-node:
+  ethereum-holesky-geth-node:
     image: ${ETHEREUM_PRYSM_IMAGE:-prysmaticlabs/prysm-beacon-chain}:${ETHEREUM_HOLESKY_PRYSM_VERSION:-v6.0.0-rc.3}
     ports:
       - 16993:16993
@@ -113,7 +113,7 @@ services:
       - --checkpoint-sync-url=https://holesky.beaconstate.info
       - --datadir=/data
       - --enable-historical-state-representation=false
-      - --execution-endpoint=http://ethereum-holesky:8551
+      - --execution-endpoint=http://ethereum-holesky-geth:8551
       - --grpc-gateway-host=0.0.0.0
       - --holesky
       - --jwt-secret=/jwtsecret
@@ -125,7 +125,7 @@ services:
       - --rpc-host=0.0.0.0
     restart: unless-stopped
     depends_on:
-      - ethereum-holesky
+      - ethereum-holesky-geth
     networks:
       - chains
     volumes:
@@ -137,12 +137,12 @@ services:
       - prometheus-scrape.port=8080
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-holesky-geth-pruned-pebble-path-node-stripprefix.stripprefix.prefixes=/ethereum-holesky
+      - traefik.http.middlewares.ethereum-holesky-geth-pruned-pebble-path-node-stripprefix.stripprefix.prefixes=/ethereum-holesky-geth
       - traefik.http.services.ethereum-holesky-geth-pruned-pebble-path-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path-node.rule=PathPrefix(`/ethereum-holesky/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky-geth/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path-node.rule=PathPrefix(`/ethereum-holesky-geth/eth`)}
       - traefik.http.routers.ethereum-holesky-geth-pruned-pebble-path-node.middlewares=ethereum-holesky-geth-pruned-pebble-path-node-stripprefix, ipallowlist
 
 volumes:
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 42ea6e7a..01807ddb 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
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-geth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet:
+  ethereum-mainnet-geth:
     image: ${ETHEREUM_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${ETHEREUM_MAINNET_FIREETH_VERSION:-}
     sysctls:
       # TCP Performance
@@ -96,15 +96,15 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-leveldb-hash-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-leveldb-hash-stripprefix.stripprefix.prefixes=/ethereum-mainnet-geth
       - traefik.http.services.ethereum-mainnet-geth-pruned-leveldb-hash.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash.rule=Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-geth`) || Path(`/ethereum-mainnet-geth/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash.rule=Path(`/ethereum-mainnet-geth`) || Path(`/ethereum-mainnet-geth/`)}
       - traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash.middlewares=ethereum-mainnet-geth-pruned-leveldb-hash-stripprefix, ipallowlist
 
-  ethereum-mainnet-firehose:
+  ethereum-mainnet-geth-firehose:
     image: ${ETHEREUM_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${ETHEREUM_MAINNET_FIREETH_VERSION:-}
     expose:
       - 10015
@@ -114,10 +114,10 @@ services:
     entrypoint: [sh, -c, exec fireeth start firehose index-builder relayer merger $@, _]
     command:
       - --log-to-file=false
-      - --relayer-source=http://ethereum-mainnet:10455
+      - --relayer-source=http://ethereum-mainnet-geth:10455
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet
+      - ethereum-mainnet-geth
     networks:
       - chains
     volumes:
@@ -131,21 +131,21 @@ services:
       - traefik.http.services.ethereum-mainnet-geth-pruned-leveldb-hash-firehose.loadbalancer.server.port=10015
       - traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-firehose.entrypoints=grpc
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-firehose.tls.certresolver=myresolver}
-      - traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-firehose.rule=Host(`ethereum-mainnet-firehose.${DOMAIN}`)
+      - traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-firehose.rule=Host(`ethereum-mainnet-geth-firehose.${DOMAIN}`)
       - traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-firehose.middlewares=ipallowlist
 
-  ethereum-mainnet-events:
+  ethereum-mainnet-geth-events:
     image: ${ETHEREUM_FIREETH_IMAGE:-ethereum/client-go}:${ETHEREUM_MAINNET_FIREETH_VERSION:-v1.15.7}
     expose:
       - 10016
     entrypoint: [sh, -c, exec fireeth start substreams-tier-1 substreams-tier-2 $@, _]
     command:
-      - --common-live-blocks-addr=http://ethereum-mainnet-firehose:10014
+      - --common-live-blocks-addr=http://ethereum-mainnet-geth-firehose:10014
       - --log-to-file=false
       - --substreams-rpc-endpoints=${ETHEREUM_MAINNET_FIREETH_ARCHIVE_RPC}
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet
+      - ethereum-mainnet-geth
     networks:
       - chains
     volumes:
@@ -158,10 +158,10 @@ services:
       - traefik.http.services.ethereum-mainnet-geth-pruned-leveldb-hash-events.loadbalancer.server.port=10016
       - traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-events.entrypoints=grpc
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-events.tls.certresolver=myresolver}
-      - traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-events.rule=Host(`ethereum-mainnet-events.${DOMAIN}`)
+      - traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-events.rule=Host(`ethereum-mainnet-geth-events.${DOMAIN}`)
       - traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-events.middlewares=ipallowlist
 
-  ethereum-mainnet-node:
+  ethereum-mainnet-geth-node:
     image: ${ETHEREUM_NIMBUS_IMAGE:-statusim/nimbus-eth2}:${ETHEREUM_MAINNET_NIMBUS_VERSION:-amd64-v25.4.1}
     user: root
     ports:
@@ -180,10 +180,10 @@ services:
       - --rest-port=3500
       - --tcp-port=15455
       - --udp-port=15455
-      - --web3-url=http://ethereum-mainnet:8551
+      - --web3-url=http://ethereum-mainnet-geth:8551
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet
+      - ethereum-mainnet-geth
     networks:
       - chains
     volumes:
@@ -195,12 +195,12 @@ services:
       - prometheus-scrape.port=8008
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-leveldb-hash-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-leveldb-hash-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-geth
       - traefik.http.services.ethereum-mainnet-geth-pruned-leveldb-hash-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-node.rule=PathPrefix(`/ethereum-mainnet/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-geth/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-node.rule=PathPrefix(`/ethereum-mainnet-geth/eth`)}
       - traefik.http.routers.ethereum-mainnet-geth-pruned-leveldb-hash-node.middlewares=ethereum-mainnet-geth-pruned-leveldb-hash-node-stripprefix, ipallowlist
 
 volumes:
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 b0c0520b..1c3be801 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
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-geth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet:
+  ethereum-mainnet-geth:
     image: ${ETHEREUM_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${ETHEREUM_MAINNET_FIREETH_VERSION:-}
     sysctls:
       # TCP Performance
@@ -96,15 +96,15 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/ethereum-mainnet-geth
       - traefik.http.services.ethereum-mainnet-geth-pruned-pebble-path.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.rule=Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-geth`) || Path(`/ethereum-mainnet-geth/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.rule=Path(`/ethereum-mainnet-geth`) || Path(`/ethereum-mainnet-geth/`)}
       - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.middlewares=ethereum-mainnet-geth-pruned-pebble-path-stripprefix, ipallowlist
 
-  ethereum-mainnet-firehose:
+  ethereum-mainnet-geth-firehose:
     image: ${ETHEREUM_FIREETH_IMAGE:-ghcr.io/streamingfast/firehose-ethereum}:${ETHEREUM_MAINNET_FIREETH_VERSION:-}
     expose:
       - 10015
@@ -114,10 +114,10 @@ services:
     entrypoint: [sh, -c, exec fireeth start firehose index-builder relayer merger $@, _]
     command:
       - --log-to-file=false
-      - --relayer-source=http://ethereum-mainnet:12023
+      - --relayer-source=http://ethereum-mainnet-geth:12023
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet
+      - ethereum-mainnet-geth
     networks:
       - chains
     volumes:
@@ -131,21 +131,21 @@ services:
       - traefik.http.services.ethereum-mainnet-geth-pruned-pebble-path-firehose.loadbalancer.server.port=10015
       - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-firehose.entrypoints=grpc
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-firehose.tls.certresolver=myresolver}
-      - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-firehose.rule=Host(`ethereum-mainnet-firehose.${DOMAIN}`)
+      - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-firehose.rule=Host(`ethereum-mainnet-geth-firehose.${DOMAIN}`)
       - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-firehose.middlewares=ipallowlist
 
-  ethereum-mainnet-events:
+  ethereum-mainnet-geth-events:
     image: ${ETHEREUM_FIREETH_IMAGE:-ethereum/client-go}:${ETHEREUM_MAINNET_FIREETH_VERSION:-v1.15.7}
     expose:
       - 10016
     entrypoint: [sh, -c, exec fireeth start substreams-tier-1 substreams-tier-2 $@, _]
     command:
-      - --common-live-blocks-addr=http://ethereum-mainnet-firehose:10014
+      - --common-live-blocks-addr=http://ethereum-mainnet-geth-firehose:10014
       - --log-to-file=false
       - --substreams-rpc-endpoints=${ETHEREUM_MAINNET_FIREETH_ARCHIVE_RPC}
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet
+      - ethereum-mainnet-geth
     networks:
       - chains
     volumes:
@@ -158,10 +158,10 @@ services:
       - traefik.http.services.ethereum-mainnet-geth-pruned-pebble-path-events.loadbalancer.server.port=10016
       - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-events.entrypoints=grpc
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-events.tls.certresolver=myresolver}
-      - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-events.rule=Host(`ethereum-mainnet-events.${DOMAIN}`)
+      - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-events.rule=Host(`ethereum-mainnet-geth-events.${DOMAIN}`)
       - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-events.middlewares=ipallowlist
 
-  ethereum-mainnet-node:
+  ethereum-mainnet-geth-node:
     image: ${ETHEREUM_NIMBUS_IMAGE:-statusim/nimbus-eth2}:${ETHEREUM_MAINNET_NIMBUS_VERSION:-amd64-v25.4.1}
     user: root
     ports:
@@ -180,10 +180,10 @@ services:
       - --rest-port=3500
       - --tcp-port=17023
       - --udp-port=17023
-      - --web3-url=http://ethereum-mainnet:8551
+      - --web3-url=http://ethereum-mainnet-geth:8551
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet
+      - ethereum-mainnet-geth
     networks:
       - chains
     volumes:
@@ -195,12 +195,12 @@ services:
       - prometheus-scrape.port=8008
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-pebble-path-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-pebble-path-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-geth
       - traefik.http.services.ethereum-mainnet-geth-pruned-pebble-path-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.rule=PathPrefix(`/ethereum-mainnet/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-geth/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.rule=PathPrefix(`/ethereum-mainnet-geth/eth`)}
       - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.middlewares=ethereum-mainnet-geth-pruned-pebble-path-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path.yml b/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path.yml
index 182f7ec6..47a25534 100644
--- a/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path.yml
+++ b/ethereum/geth/ethereum-mainnet-geth-pruned-pebble-path.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-geth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet:
+  ethereum-mainnet-geth:
     image: ${ETHEREUM_GETH_IMAGE:-ethereum/client-go}:${ETHEREUM_MAINNET_GETH_VERSION:-v1.15.7}
     sysctls:
       # TCP Performance
@@ -94,15 +94,15 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/ethereum-mainnet-geth
       - traefik.http.services.ethereum-mainnet-geth-pruned-pebble-path.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.rule=Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-geth`) || Path(`/ethereum-mainnet-geth/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.rule=Path(`/ethereum-mainnet-geth`) || Path(`/ethereum-mainnet-geth/`)}
       - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path.middlewares=ethereum-mainnet-geth-pruned-pebble-path-stripprefix, ipallowlist
 
-  ethereum-mainnet-node:
+  ethereum-mainnet-geth-node:
     image: ${ETHEREUM_PRYSM_IMAGE:-prysmaticlabs/prysm-beacon-chain}:${ETHEREUM_MAINNET_PRYSM_VERSION:-v6.0.0-rc.3}
     ports:
       - 17023:17023
@@ -113,7 +113,7 @@ services:
       - --checkpoint-sync-url=https://mainnet.beaconstate.info
       - --datadir=/data
       - --enable-historical-state-representation=false
-      - --execution-endpoint=http://ethereum-mainnet:8551
+      - --execution-endpoint=http://ethereum-mainnet-geth:8551
       - --grpc-gateway-host=0.0.0.0
       - --jwt-secret=/jwtsecret
       - --mainnet
@@ -125,7 +125,7 @@ services:
       - --rpc-host=0.0.0.0
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet
+      - ethereum-mainnet-geth
     networks:
       - chains
     volumes:
@@ -137,12 +137,12 @@ services:
       - prometheus-scrape.port=8080
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-pebble-path-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-geth-pruned-pebble-path-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-geth
       - traefik.http.services.ethereum-mainnet-geth-pruned-pebble-path-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.rule=PathPrefix(`/ethereum-mainnet/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-geth/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.rule=PathPrefix(`/ethereum-mainnet-geth/eth`)}
       - traefik.http.routers.ethereum-mainnet-geth-pruned-pebble-path-node.middlewares=ethereum-mainnet-geth-pruned-pebble-path-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/geth/ethereum-sepolia-geth-pruned-pebble-path.yml b/ethereum/geth/ethereum-sepolia-geth-pruned-pebble-path.yml
index 4a26bcab..6534723c 100644
--- a/ethereum/geth/ethereum-sepolia-geth-pruned-pebble-path.yml
+++ b/ethereum/geth/ethereum-sepolia-geth-pruned-pebble-path.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-sepolia \
+# curl -X POST https://${IP}.traefik.me/ethereum-sepolia-geth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-sepolia:
+  ethereum-sepolia-geth:
     image: ${ETHEREUM_GETH_IMAGE:-ethereum/client-go}:${ETHEREUM_SEPOLIA_GETH_VERSION:-v1.15.7}
     sysctls:
       # TCP Performance
@@ -94,15 +94,15 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-sepolia-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/ethereum-sepolia
+      - traefik.http.middlewares.ethereum-sepolia-geth-pruned-pebble-path-stripprefix.stripprefix.prefixes=/ethereum-sepolia-geth
       - traefik.http.services.ethereum-sepolia-geth-pruned-pebble-path.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia`) || Path(`/ethereum-sepolia/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path.rule=Path(`/ethereum-sepolia`) || Path(`/ethereum-sepolia/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia-geth`) || Path(`/ethereum-sepolia-geth/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path.rule=Path(`/ethereum-sepolia-geth`) || Path(`/ethereum-sepolia-geth/`)}
       - traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path.middlewares=ethereum-sepolia-geth-pruned-pebble-path-stripprefix, ipallowlist
 
-  ethereum-sepolia-node:
+  ethereum-sepolia-geth-node:
     image: ${ETHEREUM_PRYSM_IMAGE:-prysmaticlabs/prysm-beacon-chain}:${ETHEREUM_SEPOLIA_PRYSM_VERSION:-v6.0.0-rc.3}
     ports:
       - 19710:19710
@@ -113,7 +113,7 @@ services:
       - --checkpoint-sync-url=https://sepolia.beaconstate.info
       - --datadir=/data
       - --enable-historical-state-representation=false
-      - --execution-endpoint=http://ethereum-sepolia:8551
+      - --execution-endpoint=http://ethereum-sepolia-geth:8551
       - --grpc-gateway-host=0.0.0.0
       - --jwt-secret=/jwtsecret
       - --monitoring-host=0.0.0.0
@@ -125,7 +125,7 @@ services:
       - --sepolia
     restart: unless-stopped
     depends_on:
-      - ethereum-sepolia
+      - ethereum-sepolia-geth
     networks:
       - chains
     volumes:
@@ -137,12 +137,12 @@ services:
       - prometheus-scrape.port=8080
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-sepolia-geth-pruned-pebble-path-node-stripprefix.stripprefix.prefixes=/ethereum-sepolia
+      - traefik.http.middlewares.ethereum-sepolia-geth-pruned-pebble-path-node-stripprefix.stripprefix.prefixes=/ethereum-sepolia-geth
       - traefik.http.services.ethereum-sepolia-geth-pruned-pebble-path-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path-node.rule=PathPrefix(`/ethereum-sepolia/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia-geth/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path-node.rule=PathPrefix(`/ethereum-sepolia-geth/eth`)}
       - traefik.http.routers.ethereum-sepolia-geth-pruned-pebble-path-node.middlewares=ethereum-sepolia-geth-pruned-pebble-path-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/reth/ethereum-holesky-reth-archive-trace.yml b/ethereum/reth/ethereum-holesky-reth-archive-trace.yml
index 3497cd2c..bb492cd3 100644
--- a/ethereum/reth/ethereum-holesky-reth-archive-trace.yml
+++ b/ethereum/reth/ethereum-holesky-reth-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-holesky-archive \
+# curl -X POST https://${IP}.traefik.me/ethereum-holesky-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-holesky-archive:
+  ethereum-holesky-reth:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_HOLESKY_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-holesky-reth-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-holesky-archive
+      - traefik.http.middlewares.ethereum-holesky-reth-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-holesky-reth
       - traefik.http.services.ethereum-holesky-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky-archive`) || Path(`/ethereum-holesky-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-reth-archive-trace.rule=Path(`/ethereum-holesky-archive`) || Path(`/ethereum-holesky-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky-reth`) || Path(`/ethereum-holesky-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-reth-archive-trace.rule=Path(`/ethereum-holesky-reth`) || Path(`/ethereum-holesky-reth/`)}
       - traefik.http.routers.ethereum-holesky-reth-archive-trace.middlewares=ethereum-holesky-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-holesky-archive-node:
+  ethereum-holesky-reth-node:
     image: ${ETHEREUM_PRYSM_IMAGE:-prysmaticlabs/prysm-beacon-chain}:${ETHEREUM_HOLESKY_PRYSM_VERSION:-v6.0.0-rc.3}
     ports:
       - 18752:18752
@@ -116,7 +116,7 @@ services:
       - --checkpoint-sync-url=https://holesky.beaconstate.info
       - --datadir=/data
       - --enable-historical-state-representation=false
-      - --execution-endpoint=http://ethereum-holesky-archive:8551
+      - --execution-endpoint=http://ethereum-holesky-reth:8551
       - --grpc-gateway-host=0.0.0.0
       - --holesky
       - --jwt-secret=/jwtsecret
@@ -128,7 +128,7 @@ services:
       - --rpc-host=0.0.0.0
     restart: unless-stopped
     depends_on:
-      - ethereum-holesky-archive
+      - ethereum-holesky-reth
     networks:
       - chains
     volumes:
@@ -140,12 +140,12 @@ services:
       - prometheus-scrape.port=8080
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-holesky-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ethereum-holesky-archive
+      - traefik.http.middlewares.ethereum-holesky-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ethereum-holesky-reth
       - traefik.http.services.ethereum-holesky-reth-archive-trace-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-archive-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky-archive/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-reth-archive-trace-node.rule=PathPrefix(`/ethereum-holesky-archive/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky-reth/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-reth-archive-trace-node.rule=PathPrefix(`/ethereum-holesky-reth/eth`)}
       - traefik.http.routers.ethereum-holesky-reth-archive-trace-node.middlewares=ethereum-holesky-reth-archive-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/reth/ethereum-holesky-reth-pruned-trace.yml b/ethereum/reth/ethereum-holesky-reth-pruned-trace.yml
index 11199f14..41d9c28f 100644
--- a/ethereum/reth/ethereum-holesky-reth-pruned-trace.yml
+++ b/ethereum/reth/ethereum-holesky-reth-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-holesky \
+# curl -X POST https://${IP}.traefik.me/ethereum-holesky-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-holesky:
+  ethereum-holesky-reth-pruned:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_HOLESKY_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-holesky-reth-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-holesky
+      - traefik.http.middlewares.ethereum-holesky-reth-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-holesky-reth-pruned
       - traefik.http.services.ethereum-holesky-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky`) || Path(`/ethereum-holesky/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-reth-pruned-trace.rule=Path(`/ethereum-holesky`) || Path(`/ethereum-holesky/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-holesky-reth-pruned`) || Path(`/ethereum-holesky-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-reth-pruned-trace.rule=Path(`/ethereum-holesky-reth-pruned`) || Path(`/ethereum-holesky-reth-pruned/`)}
       - traefik.http.routers.ethereum-holesky-reth-pruned-trace.middlewares=ethereum-holesky-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-holesky-node:
+  ethereum-holesky-reth-pruned-node:
     image: ${ETHEREUM_PRYSM_IMAGE:-prysmaticlabs/prysm-beacon-chain}:${ETHEREUM_HOLESKY_PRYSM_VERSION:-v6.0.0-rc.3}
     ports:
       - 16849:16849
@@ -117,7 +117,7 @@ services:
       - --checkpoint-sync-url=https://holesky.beaconstate.info
       - --datadir=/data
       - --enable-historical-state-representation=false
-      - --execution-endpoint=http://ethereum-holesky:8551
+      - --execution-endpoint=http://ethereum-holesky-reth-pruned:8551
       - --grpc-gateway-host=0.0.0.0
       - --holesky
       - --jwt-secret=/jwtsecret
@@ -129,7 +129,7 @@ services:
       - --rpc-host=0.0.0.0
     restart: unless-stopped
     depends_on:
-      - ethereum-holesky
+      - ethereum-holesky-reth-pruned
     networks:
       - chains
     volumes:
@@ -141,12 +141,12 @@ services:
       - prometheus-scrape.port=8080
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-holesky-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/ethereum-holesky
+      - traefik.http.middlewares.ethereum-holesky-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/ethereum-holesky-reth-pruned
       - traefik.http.services.ethereum-holesky-reth-pruned-trace-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-pruned-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-reth-pruned-trace-node.rule=PathPrefix(`/ethereum-holesky/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-holesky-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-holesky-reth-pruned/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-holesky-reth-pruned-trace-node.rule=PathPrefix(`/ethereum-holesky-reth-pruned/eth`)}
       - traefik.http.routers.ethereum-holesky-reth-pruned-trace-node.middlewares=ethereum-holesky-reth-pruned-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/reth/ethereum-mainnet-reth-archive-trace--lighthouse-pruned-blobs.yml b/ethereum/reth/ethereum-mainnet-reth-archive-trace--lighthouse-pruned-blobs.yml
index 797f310e..8a401089 100644
--- a/ethereum/reth/ethereum-mainnet-reth-archive-trace--lighthouse-pruned-blobs.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-archive-trace--lighthouse-pruned-blobs.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet-archive:
+  ethereum-mainnet-reth:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-archive
+      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth
       - traefik.http.services.ethereum-mainnet-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-archive`) || Path(`/ethereum-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Path(`/ethereum-mainnet-archive`) || Path(`/ethereum-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-reth`) || Path(`/ethereum-mainnet-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Path(`/ethereum-mainnet-reth`) || Path(`/ethereum-mainnet-reth/`)}
       - traefik.http.routers.ethereum-mainnet-reth-archive-trace.middlewares=ethereum-mainnet-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-mainnet-archive-node:
+  ethereum-mainnet-reth-node:
     image: ${ETHEREUM_LIGHTHOUSE_IMAGE:-sigp/lighthouse}:${ETHEREUM_MAINNET_LIGHTHOUSE_VERSION:-v7.0.1}
     ports:
       - 19563:19563
@@ -117,7 +117,7 @@ services:
       - --disable-backfill-rate-limiting
       - --disable-log-timestamp
       - --disable-upnp
-      - --execution-endpoint=http://ethereum-mainnet-archive:8551
+      - --execution-endpoint=http://ethereum-mainnet-reth:8551
       - --execution-jwt=/jwtsecret
       - --genesis-backfill
       - --http
@@ -132,7 +132,7 @@ services:
       - --validator-monitor-auto
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet-archive
+      - ethereum-mainnet-reth
     networks:
       - chains
     volumes:
@@ -146,12 +146,12 @@ services:
       - prometheus-scrape.port=5054
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-archive
+      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth
       - traefik.http.services.ethereum-mainnet-reth-archive-trace-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-archive/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=PathPrefix(`/ethereum-mainnet-archive/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-reth/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=PathPrefix(`/ethereum-mainnet-reth/eth`)}
       - traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.middlewares=ethereum-mainnet-reth-archive-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/reth/ethereum-mainnet-reth-archive-trace--nimbus.yml b/ethereum/reth/ethereum-mainnet-reth-archive-trace--nimbus.yml
index a683a7aa..fa612d8c 100644
--- a/ethereum/reth/ethereum-mainnet-reth-archive-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-archive-trace--nimbus.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet-archive:
+  ethereum-mainnet-reth:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-archive
+      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth
       - traefik.http.services.ethereum-mainnet-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-archive`) || Path(`/ethereum-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Path(`/ethereum-mainnet-archive`) || Path(`/ethereum-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-reth`) || Path(`/ethereum-mainnet-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Path(`/ethereum-mainnet-reth`) || Path(`/ethereum-mainnet-reth/`)}
       - traefik.http.routers.ethereum-mainnet-reth-archive-trace.middlewares=ethereum-mainnet-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-mainnet-archive-node:
+  ethereum-mainnet-reth-node:
     image: ${ETHEREUM_NIMBUS_IMAGE:-statusim/nimbus-eth2}:${ETHEREUM_MAINNET_NIMBUS_VERSION:-amd64-v25.4.1}
     user: root
     ports:
@@ -124,10 +124,10 @@ services:
       - --rest-port=3500
       - --tcp-port=19563
       - --udp-port=19563
-      - --web3-url=http://ethereum-mainnet-archive:8551
+      - --web3-url=http://ethereum-mainnet-reth:8551
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet-archive
+      - ethereum-mainnet-reth
     networks:
       - chains
     volumes:
@@ -139,12 +139,12 @@ services:
       - prometheus-scrape.port=8008
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-archive
+      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth
       - traefik.http.services.ethereum-mainnet-reth-archive-trace-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-archive/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=PathPrefix(`/ethereum-mainnet-archive/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-reth/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=PathPrefix(`/ethereum-mainnet-reth/eth`)}
       - traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.middlewares=ethereum-mainnet-reth-archive-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/reth/ethereum-mainnet-reth-archive-trace.yml b/ethereum/reth/ethereum-mainnet-reth-archive-trace.yml
index 779a51d3..47adeab7 100644
--- a/ethereum/reth/ethereum-mainnet-reth-archive-trace.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet-archive:
+  ethereum-mainnet-reth:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-archive
+      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth
       - traefik.http.services.ethereum-mainnet-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-archive`) || Path(`/ethereum-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Path(`/ethereum-mainnet-archive`) || Path(`/ethereum-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-reth`) || Path(`/ethereum-mainnet-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace.rule=Path(`/ethereum-mainnet-reth`) || Path(`/ethereum-mainnet-reth/`)}
       - traefik.http.routers.ethereum-mainnet-reth-archive-trace.middlewares=ethereum-mainnet-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-mainnet-archive-node:
+  ethereum-mainnet-reth-node:
     image: ${ETHEREUM_PRYSM_IMAGE:-prysmaticlabs/prysm-beacon-chain}:${ETHEREUM_MAINNET_PRYSM_VERSION:-v6.0.0-rc.3}
     ports:
       - 19563:19563
@@ -116,7 +116,7 @@ services:
       - --checkpoint-sync-url=https://mainnet.beaconstate.info
       - --datadir=/data
       - --enable-historical-state-representation=false
-      - --execution-endpoint=http://ethereum-mainnet-archive:8551
+      - --execution-endpoint=http://ethereum-mainnet-reth:8551
       - --grpc-gateway-host=0.0.0.0
       - --jwt-secret=/jwtsecret
       - --mainnet
@@ -128,7 +128,7 @@ services:
       - --rpc-host=0.0.0.0
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet-archive
+      - ethereum-mainnet-reth
     networks:
       - chains
     volumes:
@@ -140,12 +140,12 @@ services:
       - prometheus-scrape.port=8080
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-archive
+      - traefik.http.middlewares.ethereum-mainnet-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth
       - traefik.http.services.ethereum-mainnet-reth-archive-trace-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-archive/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=PathPrefix(`/ethereum-mainnet-archive/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-reth/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.rule=PathPrefix(`/ethereum-mainnet-reth/eth`)}
       - traefik.http.routers.ethereum-mainnet-reth-archive-trace-node.middlewares=ethereum-mainnet-reth-archive-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/reth/ethereum-mainnet-reth-minimal-trace--blsync.yml b/ethereum/reth/ethereum-mainnet-reth-minimal-trace--blsync.yml
index 61c5bea8..bb18ecdb 100644
--- a/ethereum/reth/ethereum-mainnet-reth-minimal-trace--blsync.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-minimal-trace--blsync.yml
@@ -22,7 +22,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-minimal \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-reth-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -32,7 +32,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet-minimal:
+  ethereum-mainnet-reth-minimal:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -100,16 +100,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-minimal
+      - traefik.http.middlewares.ethereum-mainnet-reth-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth-minimal
       - traefik.http.services.ethereum-mainnet-reth-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-minimal`) || Path(`/ethereum-mainnet-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-minimal-trace.rule=Path(`/ethereum-mainnet-minimal`) || Path(`/ethereum-mainnet-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-reth-minimal`) || Path(`/ethereum-mainnet-reth-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-minimal-trace.rule=Path(`/ethereum-mainnet-reth-minimal`) || Path(`/ethereum-mainnet-reth-minimal/`)}
       - traefik.http.routers.ethereum-mainnet-reth-minimal-trace.middlewares=ethereum-mainnet-reth-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-mainnet-minimal-node:
+  ethereum-mainnet-reth-minimal-node:
     image: ${ETHEREUM_BLSYNC_IMAGE:-ethereum/client-go}:${ETHEREUM_MAINNET_BLSYNC_VERSION:-alltools-v1.15.7}
     ports:
       - 19286:19286
@@ -118,12 +118,12 @@ services:
     command:
       - --beacon.api=https://lodestar-mainnet.chainsafe.io
       - --beacon.checkpoint=${ETHEREUM_MAINNET_BEACON_CHECKPOINT}
-      - --blsync.engine.api=http://ethereum-mainnet-minimal:8551
+      - --blsync.engine.api=http://ethereum-mainnet-reth-minimal:8551
       - --blsync.jwtsecret=/jwtsecret
       - --mainnet
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet-minimal
+      - ethereum-mainnet-reth-minimal
     networks:
       - chains
     volumes:
@@ -132,7 +132,7 @@ services:
     labels:
       - prometheus-scrape.enabled=false
 
-  ethereum-mainnet-minimal-pruner:
+  ethereum-mainnet-reth-minimal-pruner:
     image: debian:latest
     entrypoint: [/scripts/prune-reth.sh]
     restart: no
diff --git a/ethereum/reth/ethereum-mainnet-reth-minimal-trace--nimbus.yml b/ethereum/reth/ethereum-mainnet-reth-minimal-trace--nimbus.yml
index b647939f..8c174b07 100644
--- a/ethereum/reth/ethereum-mainnet-reth-minimal-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-minimal-trace--nimbus.yml
@@ -22,7 +22,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-minimal \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-reth-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -32,7 +32,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet-minimal:
+  ethereum-mainnet-reth-minimal:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -100,16 +100,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-minimal
+      - traefik.http.middlewares.ethereum-mainnet-reth-minimal-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth-minimal
       - traefik.http.services.ethereum-mainnet-reth-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-minimal`) || Path(`/ethereum-mainnet-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-minimal-trace.rule=Path(`/ethereum-mainnet-minimal`) || Path(`/ethereum-mainnet-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-reth-minimal`) || Path(`/ethereum-mainnet-reth-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-minimal-trace.rule=Path(`/ethereum-mainnet-reth-minimal`) || Path(`/ethereum-mainnet-reth-minimal/`)}
       - traefik.http.routers.ethereum-mainnet-reth-minimal-trace.middlewares=ethereum-mainnet-reth-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-mainnet-minimal-node:
+  ethereum-mainnet-reth-minimal-node:
     image: ${ETHEREUM_NIMBUS_IMAGE:-statusim/nimbus-eth2}:${ETHEREUM_MAINNET_NIMBUS_VERSION:-amd64-v25.4.1}
     user: root
     ports:
@@ -128,10 +128,10 @@ services:
       - --rest-port=3500
       - --tcp-port=19286
       - --udp-port=19286
-      - --web3-url=http://ethereum-mainnet-minimal:8551
+      - --web3-url=http://ethereum-mainnet-reth-minimal:8551
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet-minimal
+      - ethereum-mainnet-reth-minimal
     networks:
       - chains
     volumes:
@@ -143,15 +143,15 @@ services:
       - prometheus-scrape.port=8008
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-minimal-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-minimal
+      - traefik.http.middlewares.ethereum-mainnet-reth-minimal-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth-minimal
       - traefik.http.services.ethereum-mainnet-reth-minimal-trace-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-minimal/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-minimal-trace-node.rule=PathPrefix(`/ethereum-mainnet-minimal/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-minimal-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-reth-minimal/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-minimal-trace-node.rule=PathPrefix(`/ethereum-mainnet-reth-minimal/eth`)}
       - traefik.http.routers.ethereum-mainnet-reth-minimal-trace-node.middlewares=ethereum-mainnet-reth-minimal-trace-node-stripprefix, ipallowlist
 
-  ethereum-mainnet-minimal-pruner:
+  ethereum-mainnet-reth-minimal-pruner:
     image: debian:latest
     entrypoint: [/scripts/prune-reth.sh]
     restart: no
diff --git a/ethereum/reth/ethereum-mainnet-reth-pruned-trace--nimbus.yml b/ethereum/reth/ethereum-mainnet-reth-pruned-trace--nimbus.yml
index 75306a04..e9f37393 100644
--- a/ethereum/reth/ethereum-mainnet-reth-pruned-trace--nimbus.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-pruned-trace--nimbus.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet:
+  ethereum-mainnet-reth-pruned:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-reth-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth-pruned
       - traefik.http.services.ethereum-mainnet-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-pruned-trace.rule=Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-reth-pruned`) || Path(`/ethereum-mainnet-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-pruned-trace.rule=Path(`/ethereum-mainnet-reth-pruned`) || Path(`/ethereum-mainnet-reth-pruned/`)}
       - traefik.http.routers.ethereum-mainnet-reth-pruned-trace.middlewares=ethereum-mainnet-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-mainnet-node:
+  ethereum-mainnet-reth-pruned-node:
     image: ${ETHEREUM_NIMBUS_IMAGE:-statusim/nimbus-eth2}:${ETHEREUM_MAINNET_NIMBUS_VERSION:-amd64-v25.4.1}
     user: root
     ports:
@@ -125,10 +125,10 @@ services:
       - --rest-port=3500
       - --tcp-port=15150
       - --udp-port=15150
-      - --web3-url=http://ethereum-mainnet:8551
+      - --web3-url=http://ethereum-mainnet-reth-pruned:8551
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet
+      - ethereum-mainnet-reth-pruned
     networks:
       - chains
     volumes:
@@ -140,12 +140,12 @@ services:
       - prometheus-scrape.port=8008
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth-pruned
       - traefik.http.services.ethereum-mainnet-reth-pruned-trace-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.rule=PathPrefix(`/ethereum-mainnet/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-reth-pruned/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.rule=PathPrefix(`/ethereum-mainnet-reth-pruned/eth`)}
       - traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.middlewares=ethereum-mainnet-reth-pruned-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/reth/ethereum-mainnet-reth-pruned-trace.yml b/ethereum/reth/ethereum-mainnet-reth-pruned-trace.yml
index dd3824d7..9cb35a0a 100644
--- a/ethereum/reth/ethereum-mainnet-reth-pruned-trace.yml
+++ b/ethereum/reth/ethereum-mainnet-reth-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-mainnet \
+# curl -X POST https://${IP}.traefik.me/ethereum-mainnet-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-mainnet:
+  ethereum-mainnet-reth-pruned:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-reth-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth-pruned
       - traefik.http.services.ethereum-mainnet-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-pruned-trace.rule=Path(`/ethereum-mainnet`) || Path(`/ethereum-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-mainnet-reth-pruned`) || Path(`/ethereum-mainnet-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-pruned-trace.rule=Path(`/ethereum-mainnet-reth-pruned`) || Path(`/ethereum-mainnet-reth-pruned/`)}
       - traefik.http.routers.ethereum-mainnet-reth-pruned-trace.middlewares=ethereum-mainnet-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-mainnet-node:
+  ethereum-mainnet-reth-pruned-node:
     image: ${ETHEREUM_PRYSM_IMAGE:-prysmaticlabs/prysm-beacon-chain}:${ETHEREUM_MAINNET_PRYSM_VERSION:-v6.0.0-rc.3}
     ports:
       - 15150:15150
@@ -117,7 +117,7 @@ services:
       - --checkpoint-sync-url=https://mainnet.beaconstate.info
       - --datadir=/data
       - --enable-historical-state-representation=false
-      - --execution-endpoint=http://ethereum-mainnet:8551
+      - --execution-endpoint=http://ethereum-mainnet-reth-pruned:8551
       - --grpc-gateway-host=0.0.0.0
       - --jwt-secret=/jwtsecret
       - --mainnet
@@ -129,7 +129,7 @@ services:
       - --rpc-host=0.0.0.0
     restart: unless-stopped
     depends_on:
-      - ethereum-mainnet
+      - ethereum-mainnet-reth-pruned
     networks:
       - chains
     volumes:
@@ -141,12 +141,12 @@ services:
       - prometheus-scrape.port=8080
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-mainnet-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet
+      - traefik.http.middlewares.ethereum-mainnet-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/ethereum-mainnet-reth-pruned
       - traefik.http.services.ethereum-mainnet-reth-pruned-trace-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.rule=PathPrefix(`/ethereum-mainnet/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-mainnet-reth-pruned/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.rule=PathPrefix(`/ethereum-mainnet-reth-pruned/eth`)}
       - traefik.http.routers.ethereum-mainnet-reth-pruned-trace-node.middlewares=ethereum-mainnet-reth-pruned-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/reth/ethereum-sepolia-reth-archive-trace.yml b/ethereum/reth/ethereum-sepolia-reth-archive-trace.yml
index 581cf2a4..f78e40d2 100644
--- a/ethereum/reth/ethereum-sepolia-reth-archive-trace.yml
+++ b/ethereum/reth/ethereum-sepolia-reth-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/ethereum-sepolia-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-sepolia-archive:
+  ethereum-sepolia-reth:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_SEPOLIA_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-sepolia-reth-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-sepolia-archive
+      - traefik.http.middlewares.ethereum-sepolia-reth-archive-trace-stripprefix.stripprefix.prefixes=/ethereum-sepolia-reth
       - traefik.http.services.ethereum-sepolia-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia-archive`) || Path(`/ethereum-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-reth-archive-trace.rule=Path(`/ethereum-sepolia-archive`) || Path(`/ethereum-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia-reth`) || Path(`/ethereum-sepolia-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-reth-archive-trace.rule=Path(`/ethereum-sepolia-reth`) || Path(`/ethereum-sepolia-reth/`)}
       - traefik.http.routers.ethereum-sepolia-reth-archive-trace.middlewares=ethereum-sepolia-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-sepolia-archive-node:
+  ethereum-sepolia-reth-node:
     image: ${ETHEREUM_PRYSM_IMAGE:-prysmaticlabs/prysm-beacon-chain}:${ETHEREUM_SEPOLIA_PRYSM_VERSION:-v6.0.0-rc.3}
     ports:
       - 19330:19330
@@ -116,7 +116,7 @@ services:
       - --checkpoint-sync-url=https://sepolia.beaconstate.info
       - --datadir=/data
       - --enable-historical-state-representation=false
-      - --execution-endpoint=http://ethereum-sepolia-archive:8551
+      - --execution-endpoint=http://ethereum-sepolia-reth:8551
       - --grpc-gateway-host=0.0.0.0
       - --jwt-secret=/jwtsecret
       - --monitoring-host=0.0.0.0
@@ -128,7 +128,7 @@ services:
       - --sepolia
     restart: unless-stopped
     depends_on:
-      - ethereum-sepolia-archive
+      - ethereum-sepolia-reth
     networks:
       - chains
     volumes:
@@ -140,12 +140,12 @@ services:
       - prometheus-scrape.port=8080
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-sepolia-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ethereum-sepolia-archive
+      - traefik.http.middlewares.ethereum-sepolia-reth-archive-trace-node-stripprefix.stripprefix.prefixes=/ethereum-sepolia-reth
       - traefik.http.services.ethereum-sepolia-reth-archive-trace-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-archive-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-archive-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia-archive/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-reth-archive-trace-node.rule=PathPrefix(`/ethereum-sepolia-archive/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-archive-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia-reth/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-reth-archive-trace-node.rule=PathPrefix(`/ethereum-sepolia-reth/eth`)}
       - traefik.http.routers.ethereum-sepolia-reth-archive-trace-node.middlewares=ethereum-sepolia-reth-archive-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/ethereum/reth/ethereum-sepolia-reth-pruned-trace.yml b/ethereum/reth/ethereum-sepolia-reth-pruned-trace.yml
index 4759014e..5b6f1537 100644
--- a/ethereum/reth/ethereum-sepolia-reth-pruned-trace.yml
+++ b/ethereum/reth/ethereum-sepolia-reth-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ethereum-sepolia \
+# curl -X POST https://${IP}.traefik.me/ethereum-sepolia-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ethereum-sepolia:
+  ethereum-sepolia-reth-pruned:
     image: ${ETHEREUM_RETH_IMAGE:-ghcr.io/paradigmxyz/reth}:${ETHEREUM_SEPOLIA_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-sepolia-reth-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-sepolia
+      - traefik.http.middlewares.ethereum-sepolia-reth-pruned-trace-stripprefix.stripprefix.prefixes=/ethereum-sepolia-reth-pruned
       - traefik.http.services.ethereum-sepolia-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia`) || Path(`/ethereum-sepolia/`))}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-reth-pruned-trace.rule=Path(`/ethereum-sepolia`) || Path(`/ethereum-sepolia/`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/ethereum-sepolia-reth-pruned`) || Path(`/ethereum-sepolia-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-reth-pruned-trace.rule=Path(`/ethereum-sepolia-reth-pruned`) || Path(`/ethereum-sepolia-reth-pruned/`)}
       - traefik.http.routers.ethereum-sepolia-reth-pruned-trace.middlewares=ethereum-sepolia-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ethereum-sepolia-node:
+  ethereum-sepolia-reth-pruned-node:
     image: ${ETHEREUM_PRYSM_IMAGE:-prysmaticlabs/prysm-beacon-chain}:${ETHEREUM_SEPOLIA_PRYSM_VERSION:-v6.0.0-rc.3}
     ports:
       - 17150:17150
@@ -117,7 +117,7 @@ services:
       - --checkpoint-sync-url=https://sepolia.beaconstate.info
       - --datadir=/data
       - --enable-historical-state-representation=false
-      - --execution-endpoint=http://ethereum-sepolia:8551
+      - --execution-endpoint=http://ethereum-sepolia-reth-pruned:8551
       - --grpc-gateway-host=0.0.0.0
       - --jwt-secret=/jwtsecret
       - --monitoring-host=0.0.0.0
@@ -129,7 +129,7 @@ services:
       - --sepolia
     restart: unless-stopped
     depends_on:
-      - ethereum-sepolia
+      - ethereum-sepolia-reth-pruned
     networks:
       - chains
     volumes:
@@ -141,12 +141,12 @@ services:
       - prometheus-scrape.port=8080
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.ethereum-sepolia-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/ethereum-sepolia
+      - traefik.http.middlewares.ethereum-sepolia-reth-pruned-trace-node-stripprefix.stripprefix.prefixes=/ethereum-sepolia-reth-pruned
       - traefik.http.services.ethereum-sepolia-reth-pruned-trace-node.loadbalancer.server.port=3500
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-pruned-trace-node.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-pruned-trace-node.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia/eth`)}
-      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-reth-pruned-trace-node.rule=PathPrefix(`/ethereum-sepolia/eth`)}
+      - ${NO_SSL:-traefik.http.routers.ethereum-sepolia-reth-pruned-trace-node.rule=Host(`$DOMAIN`) && PathPrefix(`/ethereum-sepolia-reth-pruned/eth`)}
+      - ${NO_SSL:+traefik.http.routers.ethereum-sepolia-reth-pruned-trace-node.rule=PathPrefix(`/ethereum-sepolia-reth-pruned/eth`)}
       - traefik.http.routers.ethereum-sepolia-reth-pruned-trace-node.middlewares=ethereum-sepolia-reth-pruned-trace-node-stripprefix, ipallowlist
 
 volumes:
diff --git a/fantom/opera/fantom-mainnet-opera-archive-trace.yml b/fantom/opera/fantom-mainnet-opera-archive-trace.yml
index e8088131..eadd384d 100644
--- a/fantom/opera/fantom-mainnet-opera-archive-trace.yml
+++ b/fantom/opera/fantom-mainnet-opera-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/fantom-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/fantom-mainnet-opera-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  fantom-mainnet-archive:
+  fantom-mainnet-opera-archive:
     build:
       context: ./fantom
       dockerfile: opera.Dockerfile
@@ -97,12 +97,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.fantom-mainnet-opera-archive-trace-stripprefix.stripprefix.prefixes=/fantom-mainnet-archive
+      - traefik.http.middlewares.fantom-mainnet-opera-archive-trace-stripprefix.stripprefix.prefixes=/fantom-mainnet-opera-archive
       - traefik.http.services.fantom-mainnet-opera-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/fantom-mainnet-archive`) || Path(`/fantom-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.fantom-mainnet-opera-archive-trace.rule=Path(`/fantom-mainnet-archive`) || Path(`/fantom-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/fantom-mainnet-opera-archive`) || Path(`/fantom-mainnet-opera-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.fantom-mainnet-opera-archive-trace.rule=Path(`/fantom-mainnet-opera-archive`) || Path(`/fantom-mainnet-opera-archive/`)}
       - traefik.http.routers.fantom-mainnet-opera-archive-trace.middlewares=fantom-mainnet-opera-archive-trace-stripprefix, ipallowlist
 
 volumes:
diff --git a/fantom/opera/fantom-mainnet-opera-archive.yml b/fantom/opera/fantom-mainnet-opera-archive.yml
index 64461332..6d8400f0 100644
--- a/fantom/opera/fantom-mainnet-opera-archive.yml
+++ b/fantom/opera/fantom-mainnet-opera-archive.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/fantom-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/fantom-mainnet-opera-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  fantom-mainnet-archive:
+  fantom-mainnet-opera-archive:
     build:
       context: ./fantom
       dockerfile: opera.Dockerfile
@@ -96,12 +96,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.fantom-mainnet-opera-archive-stripprefix.stripprefix.prefixes=/fantom-mainnet-archive
+      - traefik.http.middlewares.fantom-mainnet-opera-archive-stripprefix.stripprefix.prefixes=/fantom-mainnet-opera-archive
       - traefik.http.services.fantom-mainnet-opera-archive.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-archive.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-archive.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-archive.rule=Host(`$DOMAIN`) && (Path(`/fantom-mainnet-archive`) || Path(`/fantom-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.fantom-mainnet-opera-archive.rule=Path(`/fantom-mainnet-archive`) || Path(`/fantom-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-archive.rule=Host(`$DOMAIN`) && (Path(`/fantom-mainnet-opera-archive`) || Path(`/fantom-mainnet-opera-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.fantom-mainnet-opera-archive.rule=Path(`/fantom-mainnet-opera-archive`) || Path(`/fantom-mainnet-opera-archive/`)}
       - traefik.http.routers.fantom-mainnet-opera-archive.middlewares=fantom-mainnet-opera-archive-stripprefix, ipallowlist
 
 volumes:
diff --git a/fantom/opera/fantom-mainnet-opera-pruned-trace.yml b/fantom/opera/fantom-mainnet-opera-pruned-trace.yml
index 88d781fe..f94e6258 100644
--- a/fantom/opera/fantom-mainnet-opera-pruned-trace.yml
+++ b/fantom/opera/fantom-mainnet-opera-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/fantom-mainnet \
+# curl -X POST https://${IP}.traefik.me/fantom-mainnet-opera-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  fantom-mainnet:
+  fantom-mainnet-opera-pruned:
     build:
       context: ./fantom
       dockerfile: opera.Dockerfile
@@ -97,12 +97,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.fantom-mainnet-opera-pruned-trace-stripprefix.stripprefix.prefixes=/fantom-mainnet
+      - traefik.http.middlewares.fantom-mainnet-opera-pruned-trace-stripprefix.stripprefix.prefixes=/fantom-mainnet-opera-pruned
       - traefik.http.services.fantom-mainnet-opera-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/fantom-mainnet`) || Path(`/fantom-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.fantom-mainnet-opera-pruned-trace.rule=Path(`/fantom-mainnet`) || Path(`/fantom-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/fantom-mainnet-opera-pruned`) || Path(`/fantom-mainnet-opera-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.fantom-mainnet-opera-pruned-trace.rule=Path(`/fantom-mainnet-opera-pruned`) || Path(`/fantom-mainnet-opera-pruned/`)}
       - traefik.http.routers.fantom-mainnet-opera-pruned-trace.middlewares=fantom-mainnet-opera-pruned-trace-stripprefix, ipallowlist
 
 volumes:
diff --git a/fantom/opera/fantom-mainnet-opera-pruned.yml b/fantom/opera/fantom-mainnet-opera-pruned.yml
index 5ec7e9f5..dc8d1132 100644
--- a/fantom/opera/fantom-mainnet-opera-pruned.yml
+++ b/fantom/opera/fantom-mainnet-opera-pruned.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/fantom-mainnet \
+# curl -X POST https://${IP}.traefik.me/fantom-mainnet-opera-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  fantom-mainnet:
+  fantom-mainnet-opera-pruned:
     build:
       context: ./fantom
       dockerfile: opera.Dockerfile
@@ -96,12 +96,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.fantom-mainnet-opera-pruned-stripprefix.stripprefix.prefixes=/fantom-mainnet
+      - traefik.http.middlewares.fantom-mainnet-opera-pruned-stripprefix.stripprefix.prefixes=/fantom-mainnet-opera-pruned
       - traefik.http.services.fantom-mainnet-opera-pruned.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-pruned.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-pruned.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-pruned.rule=Host(`$DOMAIN`) && (Path(`/fantom-mainnet`) || Path(`/fantom-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.fantom-mainnet-opera-pruned.rule=Path(`/fantom-mainnet`) || Path(`/fantom-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.fantom-mainnet-opera-pruned.rule=Host(`$DOMAIN`) && (Path(`/fantom-mainnet-opera-pruned`) || Path(`/fantom-mainnet-opera-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.fantom-mainnet-opera-pruned.rule=Path(`/fantom-mainnet-opera-pruned`) || Path(`/fantom-mainnet-opera-pruned/`)}
       - traefik.http.routers.fantom-mainnet-opera-pruned.middlewares=fantom-mainnet-opera-pruned-stripprefix, ipallowlist
 
 volumes:
diff --git a/fantom/opera/fantom-testnet-opera-archive-trace.yml b/fantom/opera/fantom-testnet-opera-archive-trace.yml
index ddcd5269..d9f0b331 100644
--- a/fantom/opera/fantom-testnet-opera-archive-trace.yml
+++ b/fantom/opera/fantom-testnet-opera-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/fantom-testnet-archive \
+# curl -X POST https://${IP}.traefik.me/fantom-testnet-opera-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  fantom-testnet-archive:
+  fantom-testnet-opera-archive:
     build:
       context: ./fantom
       dockerfile: opera.Dockerfile
@@ -97,12 +97,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.fantom-testnet-opera-archive-trace-stripprefix.stripprefix.prefixes=/fantom-testnet-archive
+      - traefik.http.middlewares.fantom-testnet-opera-archive-trace-stripprefix.stripprefix.prefixes=/fantom-testnet-opera-archive
       - traefik.http.services.fantom-testnet-opera-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/fantom-testnet-archive`) || Path(`/fantom-testnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.fantom-testnet-opera-archive-trace.rule=Path(`/fantom-testnet-archive`) || Path(`/fantom-testnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/fantom-testnet-opera-archive`) || Path(`/fantom-testnet-opera-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.fantom-testnet-opera-archive-trace.rule=Path(`/fantom-testnet-opera-archive`) || Path(`/fantom-testnet-opera-archive/`)}
       - traefik.http.routers.fantom-testnet-opera-archive-trace.middlewares=fantom-testnet-opera-archive-trace-stripprefix, ipallowlist
 
 volumes:
diff --git a/fantom/opera/fantom-testnet-opera-archive.yml b/fantom/opera/fantom-testnet-opera-archive.yml
index e367ab9c..ccbefa98 100644
--- a/fantom/opera/fantom-testnet-opera-archive.yml
+++ b/fantom/opera/fantom-testnet-opera-archive.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/fantom-testnet-archive \
+# curl -X POST https://${IP}.traefik.me/fantom-testnet-opera-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  fantom-testnet-archive:
+  fantom-testnet-opera-archive:
     build:
       context: ./fantom
       dockerfile: opera.Dockerfile
@@ -96,12 +96,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.fantom-testnet-opera-archive-stripprefix.stripprefix.prefixes=/fantom-testnet-archive
+      - traefik.http.middlewares.fantom-testnet-opera-archive-stripprefix.stripprefix.prefixes=/fantom-testnet-opera-archive
       - traefik.http.services.fantom-testnet-opera-archive.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-archive.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-archive.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-archive.rule=Host(`$DOMAIN`) && (Path(`/fantom-testnet-archive`) || Path(`/fantom-testnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.fantom-testnet-opera-archive.rule=Path(`/fantom-testnet-archive`) || Path(`/fantom-testnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-archive.rule=Host(`$DOMAIN`) && (Path(`/fantom-testnet-opera-archive`) || Path(`/fantom-testnet-opera-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.fantom-testnet-opera-archive.rule=Path(`/fantom-testnet-opera-archive`) || Path(`/fantom-testnet-opera-archive/`)}
       - traefik.http.routers.fantom-testnet-opera-archive.middlewares=fantom-testnet-opera-archive-stripprefix, ipallowlist
 
 volumes:
diff --git a/fantom/opera/fantom-testnet-opera-pruned-trace.yml b/fantom/opera/fantom-testnet-opera-pruned-trace.yml
index 9a173a27..c142d3f5 100644
--- a/fantom/opera/fantom-testnet-opera-pruned-trace.yml
+++ b/fantom/opera/fantom-testnet-opera-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/fantom-testnet \
+# curl -X POST https://${IP}.traefik.me/fantom-testnet-opera-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  fantom-testnet:
+  fantom-testnet-opera-pruned:
     build:
       context: ./fantom
       dockerfile: opera.Dockerfile
@@ -97,12 +97,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.fantom-testnet-opera-pruned-trace-stripprefix.stripprefix.prefixes=/fantom-testnet
+      - traefik.http.middlewares.fantom-testnet-opera-pruned-trace-stripprefix.stripprefix.prefixes=/fantom-testnet-opera-pruned
       - traefik.http.services.fantom-testnet-opera-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/fantom-testnet`) || Path(`/fantom-testnet/`))}
-      - ${NO_SSL:+traefik.http.routers.fantom-testnet-opera-pruned-trace.rule=Path(`/fantom-testnet`) || Path(`/fantom-testnet/`)}
+      - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/fantom-testnet-opera-pruned`) || Path(`/fantom-testnet-opera-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.fantom-testnet-opera-pruned-trace.rule=Path(`/fantom-testnet-opera-pruned`) || Path(`/fantom-testnet-opera-pruned/`)}
       - traefik.http.routers.fantom-testnet-opera-pruned-trace.middlewares=fantom-testnet-opera-pruned-trace-stripprefix, ipallowlist
 
 volumes:
diff --git a/fantom/opera/fantom-testnet-opera-pruned.yml b/fantom/opera/fantom-testnet-opera-pruned.yml
index 8dc4899a..c9423251 100644
--- a/fantom/opera/fantom-testnet-opera-pruned.yml
+++ b/fantom/opera/fantom-testnet-opera-pruned.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/fantom-testnet \
+# curl -X POST https://${IP}.traefik.me/fantom-testnet-opera-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  fantom-testnet:
+  fantom-testnet-opera-pruned:
     build:
       context: ./fantom
       dockerfile: opera.Dockerfile
@@ -96,12 +96,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.fantom-testnet-opera-pruned-stripprefix.stripprefix.prefixes=/fantom-testnet
+      - traefik.http.middlewares.fantom-testnet-opera-pruned-stripprefix.stripprefix.prefixes=/fantom-testnet-opera-pruned
       - traefik.http.services.fantom-testnet-opera-pruned.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-pruned.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-pruned.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-pruned.rule=Host(`$DOMAIN`) && (Path(`/fantom-testnet`) || Path(`/fantom-testnet/`))}
-      - ${NO_SSL:+traefik.http.routers.fantom-testnet-opera-pruned.rule=Path(`/fantom-testnet`) || Path(`/fantom-testnet/`)}
+      - ${NO_SSL:-traefik.http.routers.fantom-testnet-opera-pruned.rule=Host(`$DOMAIN`) && (Path(`/fantom-testnet-opera-pruned`) || Path(`/fantom-testnet-opera-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.fantom-testnet-opera-pruned.rule=Path(`/fantom-testnet-opera-pruned`) || Path(`/fantom-testnet-opera-pruned/`)}
       - traefik.http.routers.fantom-testnet-opera-pruned.middlewares=fantom-testnet-opera-pruned-stripprefix, ipallowlist
 
 volumes:
diff --git a/fantom/sonic/fantom-mainnet-sonic-archive.yml b/fantom/sonic/fantom-mainnet-sonic-archive.yml
index 4b45cee8..dfbb7651 100644
--- a/fantom/sonic/fantom-mainnet-sonic-archive.yml
+++ b/fantom/sonic/fantom-mainnet-sonic-archive.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/fantom-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/fantom-mainnet \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  fantom-mainnet-archive:
+  fantom-mainnet:
     build:
       context: ./fantom
       dockerfile: sonic.Dockerfile
@@ -95,12 +95,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.fantom-mainnet-sonic-archive-stripprefix.stripprefix.prefixes=/fantom-mainnet-archive
+      - traefik.http.middlewares.fantom-mainnet-sonic-archive-stripprefix.stripprefix.prefixes=/fantom-mainnet
       - traefik.http.services.fantom-mainnet-sonic-archive.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.fantom-mainnet-sonic-archive.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.fantom-mainnet-sonic-archive.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.fantom-mainnet-sonic-archive.rule=Host(`$DOMAIN`) && (Path(`/fantom-mainnet-archive`) || Path(`/fantom-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.fantom-mainnet-sonic-archive.rule=Path(`/fantom-mainnet-archive`) || Path(`/fantom-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.fantom-mainnet-sonic-archive.rule=Host(`$DOMAIN`) && (Path(`/fantom-mainnet`) || Path(`/fantom-mainnet/`))}
+      - ${NO_SSL:+traefik.http.routers.fantom-mainnet-sonic-archive.rule=Path(`/fantom-mainnet`) || Path(`/fantom-mainnet/`)}
       - traefik.http.routers.fantom-mainnet-sonic-archive.middlewares=fantom-mainnet-sonic-archive-stripprefix, ipallowlist
 
 volumes:
diff --git a/fantom/sonic/fantom-testnet-sonic-archive.yml b/fantom/sonic/fantom-testnet-sonic-archive.yml
index 8ed45019..07dbc7ae 100644
--- a/fantom/sonic/fantom-testnet-sonic-archive.yml
+++ b/fantom/sonic/fantom-testnet-sonic-archive.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/fantom-testnet-archive \
+# curl -X POST https://${IP}.traefik.me/fantom-testnet \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  fantom-testnet-archive:
+  fantom-testnet:
     build:
       context: ./fantom
       dockerfile: sonic.Dockerfile
@@ -95,12 +95,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.fantom-testnet-sonic-archive-stripprefix.stripprefix.prefixes=/fantom-testnet-archive
+      - traefik.http.middlewares.fantom-testnet-sonic-archive-stripprefix.stripprefix.prefixes=/fantom-testnet
       - traefik.http.services.fantom-testnet-sonic-archive.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.fantom-testnet-sonic-archive.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.fantom-testnet-sonic-archive.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.fantom-testnet-sonic-archive.rule=Host(`$DOMAIN`) && (Path(`/fantom-testnet-archive`) || Path(`/fantom-testnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.fantom-testnet-sonic-archive.rule=Path(`/fantom-testnet-archive`) || Path(`/fantom-testnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.fantom-testnet-sonic-archive.rule=Host(`$DOMAIN`) && (Path(`/fantom-testnet`) || Path(`/fantom-testnet/`))}
+      - ${NO_SSL:+traefik.http.routers.fantom-testnet-sonic-archive.rule=Path(`/fantom-testnet`) || Path(`/fantom-testnet/`)}
       - traefik.http.routers.fantom-testnet-sonic-archive.middlewares=fantom-testnet-sonic-archive-stripprefix, ipallowlist
 
 volumes:
diff --git a/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml b/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
index 69657f42..6ca5dfcb 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/gnosis-chiado-archive \
+# curl -X POST https://${IP}.traefik.me/gnosis-chiado-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  gnosis-chiado-archive:
+  gnosis-chiado-erigon3-archive:
     image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -102,12 +102,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.gnosis-chiado-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/gnosis-chiado-archive
+      - traefik.http.middlewares.gnosis-chiado-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/gnosis-chiado-erigon3-archive
       - traefik.http.services.gnosis-chiado-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-chiado-archive`) || Path(`/gnosis-chiado-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.gnosis-chiado-erigon3-archive-trace.rule=Path(`/gnosis-chiado-archive`) || Path(`/gnosis-chiado-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-chiado-erigon3-archive`) || Path(`/gnosis-chiado-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.gnosis-chiado-erigon3-archive-trace.rule=Path(`/gnosis-chiado-erigon3-archive`) || Path(`/gnosis-chiado-erigon3-archive/`)}
       - traefik.http.routers.gnosis-chiado-erigon3-archive-trace.middlewares=gnosis-chiado-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml b/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
index 48763481..78d82066 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/gnosis-chiado-minimal \
+# curl -X POST https://${IP}.traefik.me/gnosis-chiado-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  gnosis-chiado-minimal:
+  gnosis-chiado-erigon3-minimal:
     image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -102,12 +102,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.gnosis-chiado-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/gnosis-chiado-minimal
+      - traefik.http.middlewares.gnosis-chiado-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/gnosis-chiado-erigon3-minimal
       - traefik.http.services.gnosis-chiado-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-chiado-minimal`) || Path(`/gnosis-chiado-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.gnosis-chiado-erigon3-minimal-trace.rule=Path(`/gnosis-chiado-minimal`) || Path(`/gnosis-chiado-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-chiado-erigon3-minimal`) || Path(`/gnosis-chiado-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.gnosis-chiado-erigon3-minimal-trace.rule=Path(`/gnosis-chiado-erigon3-minimal`) || Path(`/gnosis-chiado-erigon3-minimal/`)}
       - traefik.http.routers.gnosis-chiado-erigon3-minimal-trace.middlewares=gnosis-chiado-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml b/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
index 70c7459c..e326b02e 100644
--- a/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
+++ b/gnosis/erigon3/gnosis-chiado-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/gnosis-chiado \
+# curl -X POST https://${IP}.traefik.me/gnosis-chiado-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  gnosis-chiado:
+  gnosis-chiado-erigon3:
     image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_CHIADO_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -102,12 +102,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.gnosis-chiado-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/gnosis-chiado
+      - traefik.http.middlewares.gnosis-chiado-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/gnosis-chiado-erigon3
       - traefik.http.services.gnosis-chiado-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-chiado`) || Path(`/gnosis-chiado/`))}
-      - ${NO_SSL:+traefik.http.routers.gnosis-chiado-erigon3-pruned-trace.rule=Path(`/gnosis-chiado`) || Path(`/gnosis-chiado/`)}
+      - ${NO_SSL:-traefik.http.routers.gnosis-chiado-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-chiado-erigon3`) || Path(`/gnosis-chiado-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.gnosis-chiado-erigon3-pruned-trace.rule=Path(`/gnosis-chiado-erigon3`) || Path(`/gnosis-chiado-erigon3/`)}
       - traefik.http.routers.gnosis-chiado-erigon3-pruned-trace.middlewares=gnosis-chiado-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml b/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
index 63478702..df0fc652 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/gnosis-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/gnosis-mainnet-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  gnosis-mainnet-archive:
+  gnosis-mainnet-erigon3-archive:
     image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -102,12 +102,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.gnosis-mainnet-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/gnosis-mainnet-archive
+      - traefik.http.middlewares.gnosis-mainnet-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/gnosis-mainnet-erigon3-archive
       - traefik.http.services.gnosis-mainnet-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-mainnet-archive`) || Path(`/gnosis-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.gnosis-mainnet-erigon3-archive-trace.rule=Path(`/gnosis-mainnet-archive`) || Path(`/gnosis-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-mainnet-erigon3-archive`) || Path(`/gnosis-mainnet-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.gnosis-mainnet-erigon3-archive-trace.rule=Path(`/gnosis-mainnet-erigon3-archive`) || Path(`/gnosis-mainnet-erigon3-archive/`)}
       - traefik.http.routers.gnosis-mainnet-erigon3-archive-trace.middlewares=gnosis-mainnet-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml b/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
index 4e1b8ffd..483e225e 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/gnosis-mainnet-minimal \
+# curl -X POST https://${IP}.traefik.me/gnosis-mainnet-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  gnosis-mainnet-minimal:
+  gnosis-mainnet-erigon3-minimal:
     image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -102,12 +102,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.gnosis-mainnet-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/gnosis-mainnet-minimal
+      - traefik.http.middlewares.gnosis-mainnet-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/gnosis-mainnet-erigon3-minimal
       - traefik.http.services.gnosis-mainnet-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-mainnet-minimal`) || Path(`/gnosis-mainnet-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.gnosis-mainnet-erigon3-minimal-trace.rule=Path(`/gnosis-mainnet-minimal`) || Path(`/gnosis-mainnet-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-mainnet-erigon3-minimal`) || Path(`/gnosis-mainnet-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.gnosis-mainnet-erigon3-minimal-trace.rule=Path(`/gnosis-mainnet-erigon3-minimal`) || Path(`/gnosis-mainnet-erigon3-minimal/`)}
       - traefik.http.routers.gnosis-mainnet-erigon3-minimal-trace.middlewares=gnosis-mainnet-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml b/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
index e2ace1dc..b64f7c7b 100644
--- a/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
+++ b/gnosis/erigon3/gnosis-mainnet-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/gnosis-mainnet \
+# curl -X POST https://${IP}.traefik.me/gnosis-mainnet-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  gnosis-mainnet:
+  gnosis-mainnet-erigon3:
     image: ${GNOSIS_ERIGON3_IMAGE:-erigontech/erigon}:${GNOSIS_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -102,12 +102,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.gnosis-mainnet-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/gnosis-mainnet
+      - traefik.http.middlewares.gnosis-mainnet-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/gnosis-mainnet-erigon3
       - traefik.http.services.gnosis-mainnet-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-mainnet`) || Path(`/gnosis-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.gnosis-mainnet-erigon3-pruned-trace.rule=Path(`/gnosis-mainnet`) || Path(`/gnosis-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.gnosis-mainnet-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/gnosis-mainnet-erigon3`) || Path(`/gnosis-mainnet-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.gnosis-mainnet-erigon3-pruned-trace.rule=Path(`/gnosis-mainnet-erigon3`) || Path(`/gnosis-mainnet-erigon3/`)}
       - traefik.http.routers.gnosis-mainnet-erigon3-pruned-trace.middlewares=gnosis-mainnet-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/haqq/haqq/haqq-mainnet-haqq-pruned.yml b/haqq/haqq/haqq-mainnet-haqq-pruned.yml
index 6ff5f71b..351216c4 100644
--- a/haqq/haqq/haqq-mainnet-haqq-pruned.yml
+++ b/haqq/haqq/haqq-mainnet-haqq-pruned.yml
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  haqq-mainnet:
+  haqq-mainnet-client:
     image: ${HAQQ_HAQQ_IMAGE:-alhaqq/haqq}:${HAQQ_MAINNET_HAQQ_VERSION:-v1.8.2}
     sysctls:
       # TCP Performance
@@ -50,6 +50,7 @@ services:
       - 10465:10465/udp
     expose:
       - 8545
+      - 8546
     entrypoint: [haqqd, start]
     command: --p2p.laddr=tcp://0.0.0.0:10465
     restart: unless-stopped
@@ -62,9 +63,30 @@ services:
     logging: *logging-defaults
     labels:
       - prometheus-scrape.enabled=false
+
+  haqq-mainnet:
+    image: nginx
+    expose:
+      - '80'
+    environment:
+      PROXY_HOST: haqq-mainnet-client
+      RPC_PATH: ''
+      RPC_PORT: 8545
+      WS_PATH: ''
+      WS_PORT: 8546
+    restart: unless-stopped
+    depends_on:
+      - haqq-mainnet-client
+    networks:
+      - chains
+    volumes:
+      - ./nginx-proxy:/etc/nginx/templates
+    logging: *logging-defaults
+    labels:
+      - prometheus-scrape.enabled=false
       - traefik.enable=true
       - traefik.http.middlewares.haqq-mainnet-haqq-pruned-stripprefix.stripprefix.prefixes=/haqq-mainnet
-      - traefik.http.services.haqq-mainnet-haqq-pruned.loadbalancer.server.port=8545
+      - traefik.http.services.haqq-mainnet-haqq-pruned.loadbalancer.server.port=80
       - ${NO_SSL:-traefik.http.routers.haqq-mainnet-haqq-pruned.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.haqq-mainnet-haqq-pruned.tls.certresolver=myresolver}
       - ${NO_SSL:-traefik.http.routers.haqq-mainnet-haqq-pruned.rule=Host(`$DOMAIN`) && (Path(`/haqq-mainnet`) || Path(`/haqq-mainnet/`))}
diff --git a/linea/erigon3/linea-mainnet-erigon3-archive-trace.yml b/linea/erigon3/linea-mainnet-erigon3-archive-trace.yml
index d1e82eb2..e60d4ea6 100644
--- a/linea/erigon3/linea-mainnet-erigon3-archive-trace.yml
+++ b/linea/erigon3/linea-mainnet-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/linea-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/linea-mainnet-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  linea-mainnet-archive:
+  linea-mainnet-erigon3-archive:
     image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -94,12 +94,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.linea-mainnet-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/linea-mainnet-archive
+      - traefik.http.middlewares.linea-mainnet-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/linea-mainnet-erigon3-archive
       - traefik.http.services.linea-mainnet-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-mainnet-archive`) || Path(`/linea-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.linea-mainnet-erigon3-archive-trace.rule=Path(`/linea-mainnet-archive`) || Path(`/linea-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-mainnet-erigon3-archive`) || Path(`/linea-mainnet-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.linea-mainnet-erigon3-archive-trace.rule=Path(`/linea-mainnet-erigon3-archive`) || Path(`/linea-mainnet-erigon3-archive/`)}
       - traefik.http.routers.linea-mainnet-erigon3-archive-trace.middlewares=linea-mainnet-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/linea/erigon3/linea-mainnet-erigon3-minimal-trace.yml b/linea/erigon3/linea-mainnet-erigon3-minimal-trace.yml
index 124980c1..31c9e5d1 100644
--- a/linea/erigon3/linea-mainnet-erigon3-minimal-trace.yml
+++ b/linea/erigon3/linea-mainnet-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/linea-mainnet-minimal \
+# curl -X POST https://${IP}.traefik.me/linea-mainnet-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  linea-mainnet-minimal:
+  linea-mainnet-erigon3-minimal:
     image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -94,12 +94,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.linea-mainnet-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/linea-mainnet-minimal
+      - traefik.http.middlewares.linea-mainnet-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/linea-mainnet-erigon3-minimal
       - traefik.http.services.linea-mainnet-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-mainnet-minimal`) || Path(`/linea-mainnet-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.linea-mainnet-erigon3-minimal-trace.rule=Path(`/linea-mainnet-minimal`) || Path(`/linea-mainnet-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-mainnet-erigon3-minimal`) || Path(`/linea-mainnet-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.linea-mainnet-erigon3-minimal-trace.rule=Path(`/linea-mainnet-erigon3-minimal`) || Path(`/linea-mainnet-erigon3-minimal/`)}
       - traefik.http.routers.linea-mainnet-erigon3-minimal-trace.middlewares=linea-mainnet-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/linea/erigon3/linea-mainnet-erigon3-pruned-trace.yml b/linea/erigon3/linea-mainnet-erigon3-pruned-trace.yml
index dfc05838..e9ecc89b 100644
--- a/linea/erigon3/linea-mainnet-erigon3-pruned-trace.yml
+++ b/linea/erigon3/linea-mainnet-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/linea-mainnet \
+# curl -X POST https://${IP}.traefik.me/linea-mainnet-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  linea-mainnet:
+  linea-mainnet-erigon3:
     image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -94,12 +94,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.linea-mainnet-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/linea-mainnet
+      - traefik.http.middlewares.linea-mainnet-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/linea-mainnet-erigon3
       - traefik.http.services.linea-mainnet-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-mainnet`) || Path(`/linea-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.linea-mainnet-erigon3-pruned-trace.rule=Path(`/linea-mainnet`) || Path(`/linea-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.linea-mainnet-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-mainnet-erigon3`) || Path(`/linea-mainnet-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.linea-mainnet-erigon3-pruned-trace.rule=Path(`/linea-mainnet-erigon3`) || Path(`/linea-mainnet-erigon3/`)}
       - traefik.http.routers.linea-mainnet-erigon3-pruned-trace.middlewares=linea-mainnet-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/linea/erigon3/linea-sepolia-erigon3-archive-trace.yml b/linea/erigon3/linea-sepolia-erigon3-archive-trace.yml
index 17c55025..32dfcad4 100644
--- a/linea/erigon3/linea-sepolia-erigon3-archive-trace.yml
+++ b/linea/erigon3/linea-sepolia-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/linea-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/linea-sepolia-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  linea-sepolia-archive:
+  linea-sepolia-erigon3-archive:
     image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -94,12 +94,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.linea-sepolia-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/linea-sepolia-archive
+      - traefik.http.middlewares.linea-sepolia-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/linea-sepolia-erigon3-archive
       - traefik.http.services.linea-sepolia-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-sepolia-archive`) || Path(`/linea-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.linea-sepolia-erigon3-archive-trace.rule=Path(`/linea-sepolia-archive`) || Path(`/linea-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-sepolia-erigon3-archive`) || Path(`/linea-sepolia-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.linea-sepolia-erigon3-archive-trace.rule=Path(`/linea-sepolia-erigon3-archive`) || Path(`/linea-sepolia-erigon3-archive/`)}
       - traefik.http.routers.linea-sepolia-erigon3-archive-trace.middlewares=linea-sepolia-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/linea/erigon3/linea-sepolia-erigon3-minimal-trace.yml b/linea/erigon3/linea-sepolia-erigon3-minimal-trace.yml
index 2eee8b2e..a4119586 100644
--- a/linea/erigon3/linea-sepolia-erigon3-minimal-trace.yml
+++ b/linea/erigon3/linea-sepolia-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/linea-sepolia-minimal \
+# curl -X POST https://${IP}.traefik.me/linea-sepolia-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  linea-sepolia-minimal:
+  linea-sepolia-erigon3-minimal:
     image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -94,12 +94,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.linea-sepolia-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/linea-sepolia-minimal
+      - traefik.http.middlewares.linea-sepolia-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/linea-sepolia-erigon3-minimal
       - traefik.http.services.linea-sepolia-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-sepolia-minimal`) || Path(`/linea-sepolia-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.linea-sepolia-erigon3-minimal-trace.rule=Path(`/linea-sepolia-minimal`) || Path(`/linea-sepolia-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-sepolia-erigon3-minimal`) || Path(`/linea-sepolia-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.linea-sepolia-erigon3-minimal-trace.rule=Path(`/linea-sepolia-erigon3-minimal`) || Path(`/linea-sepolia-erigon3-minimal/`)}
       - traefik.http.routers.linea-sepolia-erigon3-minimal-trace.middlewares=linea-sepolia-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/linea/erigon3/linea-sepolia-erigon3-pruned-trace.yml b/linea/erigon3/linea-sepolia-erigon3-pruned-trace.yml
index 54d32591..2c374e68 100644
--- a/linea/erigon3/linea-sepolia-erigon3-pruned-trace.yml
+++ b/linea/erigon3/linea-sepolia-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/linea-sepolia \
+# curl -X POST https://${IP}.traefik.me/linea-sepolia-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  linea-sepolia:
+  linea-sepolia-erigon3:
     image: ${LINEA_ERIGON3_IMAGE:-erigontech/erigon}:${LINEA_SEPOLIA_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -94,12 +94,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.linea-sepolia-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/linea-sepolia
+      - traefik.http.middlewares.linea-sepolia-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/linea-sepolia-erigon3
       - traefik.http.services.linea-sepolia-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-sepolia`) || Path(`/linea-sepolia/`))}
-      - ${NO_SSL:+traefik.http.routers.linea-sepolia-erigon3-pruned-trace.rule=Path(`/linea-sepolia`) || Path(`/linea-sepolia/`)}
+      - ${NO_SSL:-traefik.http.routers.linea-sepolia-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/linea-sepolia-erigon3`) || Path(`/linea-sepolia-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.linea-sepolia-erigon3-pruned-trace.rule=Path(`/linea-sepolia-erigon3`) || Path(`/linea-sepolia-erigon3/`)}
       - traefik.http.routers.linea-sepolia-erigon3-pruned-trace.middlewares=linea-sepolia-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/op/erigon/base-mainnet-op-erigon-archive-trace.yml b/op/erigon/base-mainnet-op-erigon-archive-trace.yml
index 90a416ae..fb016dcc 100644
--- a/op/erigon/base-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/base-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/base-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/base-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  base-mainnet-archive:
+  base-mainnet-op-erigon:
     image: ${BASE_ERIGON_IMAGE:-testinprod/op-erigon}:${BASE_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.base-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/base-mainnet-archive
+      - traefik.http.middlewares.base-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/base-mainnet-op-erigon
       - traefik.http.services.base-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet-archive`) || Path(`/base-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-erigon-archive-trace.rule=Path(`/base-mainnet-archive`) || Path(`/base-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet-op-erigon`) || Path(`/base-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-erigon-archive-trace.rule=Path(`/base-mainnet-op-erigon`) || Path(`/base-mainnet-op-erigon/`)}
       - traefik.http.routers.base-mainnet-op-erigon-archive-trace.middlewares=base-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  base-mainnet-archive-node:
+  base-mainnet-op-erigon-node:
     image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 18092:18092
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -138,7 +138,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - base-mainnet-archive
+      - base-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/base-sepolia-op-erigon-archive-trace.yml b/op/erigon/base-sepolia-op-erigon-archive-trace.yml
index 8b44350d..3ca4c36a 100644
--- a/op/erigon/base-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/base-sepolia-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/base-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/base-sepolia-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  base-sepolia-archive:
+  base-sepolia-op-erigon:
     image: ${BASE_ERIGON_IMAGE:-testinprod/op-erigon}:${BASE_SEPOLIA_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.base-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/base-sepolia-archive
+      - traefik.http.middlewares.base-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/base-sepolia-op-erigon
       - traefik.http.services.base-sepolia-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.base-sepolia-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.base-sepolia-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.base-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/base-sepolia-archive`) || Path(`/base-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.base-sepolia-op-erigon-archive-trace.rule=Path(`/base-sepolia-archive`) || Path(`/base-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.base-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/base-sepolia-op-erigon`) || Path(`/base-sepolia-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.base-sepolia-op-erigon-archive-trace.rule=Path(`/base-sepolia-op-erigon`) || Path(`/base-sepolia-op-erigon/`)}
       - traefik.http.routers.base-sepolia-op-erigon-archive-trace.middlewares=base-sepolia-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  base-sepolia-archive-node:
+  base-sepolia-op-erigon-node:
     image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 18487:18487
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - base-sepolia-archive
+      - base-sepolia-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/bob-mainnet-op-erigon-archive-trace.yml b/op/erigon/bob-mainnet-op-erigon-archive-trace.yml
index 4841f667..2a6194f4 100644
--- a/op/erigon/bob-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/bob-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/bob-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/bob-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  bob-mainnet-archive:
+  bob-mainnet-op-erigon:
     image: ${BOB_ERIGON_IMAGE:-testinprod/op-erigon}:${BOB_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.bob-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/bob-mainnet-archive
+      - traefik.http.middlewares.bob-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/bob-mainnet-op-erigon
       - traefik.http.services.bob-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.bob-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.bob-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.bob-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/bob-mainnet-archive`) || Path(`/bob-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.bob-mainnet-op-erigon-archive-trace.rule=Path(`/bob-mainnet-archive`) || Path(`/bob-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.bob-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/bob-mainnet-op-erigon`) || Path(`/bob-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.bob-mainnet-op-erigon-archive-trace.rule=Path(`/bob-mainnet-op-erigon`) || Path(`/bob-mainnet-op-erigon/`)}
       - traefik.http.routers.bob-mainnet-op-erigon-archive-trace.middlewares=bob-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  bob-mainnet-archive-node:
+  bob-mainnet-op-erigon-node:
     image: ${BOB_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BOB_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 16071:16071
@@ -118,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://bob-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://bob-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - bob-mainnet-archive
+      - bob-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/boba-mainnet-op-erigon-archive-trace.yml b/op/erigon/boba-mainnet-op-erigon-archive-trace.yml
index 646d96a2..5f703a03 100644
--- a/op/erigon/boba-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/boba-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/boba-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/boba-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  boba-mainnet-archive:
+  boba-mainnet-op-erigon:
     image: ${BOBA_ERIGON_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/op-erigon}:${BOBA_MAINNET_ERIGON_VERSION:-v1.2.11}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.boba-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/boba-mainnet-archive
+      - traefik.http.middlewares.boba-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/boba-mainnet-op-erigon
       - traefik.http.services.boba-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.boba-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.boba-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.boba-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/boba-mainnet-archive`) || Path(`/boba-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.boba-mainnet-op-erigon-archive-trace.rule=Path(`/boba-mainnet-archive`) || Path(`/boba-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.boba-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/boba-mainnet-op-erigon`) || Path(`/boba-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.boba-mainnet-op-erigon-archive-trace.rule=Path(`/boba-mainnet-op-erigon`) || Path(`/boba-mainnet-op-erigon/`)}
       - traefik.http.routers.boba-mainnet-op-erigon-archive-trace.middlewares=boba-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  boba-mainnet-archive-node:
+  boba-mainnet-op-erigon-node:
     image: ${BOBA_NODE_IMAGE:-us-docker.pkg.dev/boba-392114/bobanetwork-tools-artifacts/images/op-node}:${BOBA_MAINNET_NODE_VERSION:-v1.6.18}
     ports:
       - 16732:16732
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://boba-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://boba-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -138,7 +138,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - boba-mainnet-archive
+      - boba-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/hashkeychain-mainnet-op-erigon-archive-trace.yml b/op/erigon/hashkeychain-mainnet-op-erigon-archive-trace.yml
index 1783b11e..9e479a9f 100644
--- a/op/erigon/hashkeychain-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/hashkeychain-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/hashkeychain-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/hashkeychain-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  hashkeychain-mainnet-archive:
+  hashkeychain-mainnet-op-erigon:
     image: ${HASHKEYCHAIN_ERIGON_IMAGE:-testinprod/op-erigon}:${HASHKEYCHAIN_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.hashkeychain-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/hashkeychain-mainnet-archive
+      - traefik.http.middlewares.hashkeychain-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/hashkeychain-mainnet-op-erigon
       - traefik.http.services.hashkeychain-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.hashkeychain-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.hashkeychain-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.hashkeychain-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/hashkeychain-mainnet-archive`) || Path(`/hashkeychain-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.hashkeychain-mainnet-op-erigon-archive-trace.rule=Path(`/hashkeychain-mainnet-archive`) || Path(`/hashkeychain-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.hashkeychain-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/hashkeychain-mainnet-op-erigon`) || Path(`/hashkeychain-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.hashkeychain-mainnet-op-erigon-archive-trace.rule=Path(`/hashkeychain-mainnet-op-erigon`) || Path(`/hashkeychain-mainnet-op-erigon/`)}
       - traefik.http.routers.hashkeychain-mainnet-op-erigon-archive-trace.middlewares=hashkeychain-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  hashkeychain-mainnet-archive-node:
+  hashkeychain-mainnet-op-erigon-node:
     image: ${HASHKEYCHAIN_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${HASHKEYCHAIN_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 16378:16378
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://hashkeychain-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://hashkeychain-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -138,7 +138,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - hashkeychain-mainnet-archive
+      - hashkeychain-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/ink-mainnet-op-erigon-archive-trace.yml b/op/erigon/ink-mainnet-op-erigon-archive-trace.yml
index 12a75249..94bf1070 100644
--- a/op/erigon/ink-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/ink-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ink-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/ink-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ink-mainnet-archive:
+  ink-mainnet-op-erigon:
     image: ${INK_ERIGON_IMAGE:-testinprod/op-erigon}:${INK_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ink-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/ink-mainnet-archive
+      - traefik.http.middlewares.ink-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/ink-mainnet-op-erigon
       - traefik.http.services.ink-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ink-mainnet-archive`) || Path(`/ink-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-erigon-archive-trace.rule=Path(`/ink-mainnet-archive`) || Path(`/ink-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ink-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ink-mainnet-op-erigon`) || Path(`/ink-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.ink-mainnet-op-erigon-archive-trace.rule=Path(`/ink-mainnet-op-erigon`) || Path(`/ink-mainnet-op-erigon/`)}
       - traefik.http.routers.ink-mainnet-op-erigon-archive-trace.middlewares=ink-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ink-mainnet-archive-node:
+  ink-mainnet-op-erigon-node:
     image: ${INK_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${INK_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 16990:16990
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://ink-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://ink-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -138,7 +138,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - ink-mainnet-archive
+      - ink-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/ink-sepolia-op-erigon-archive-trace.yml b/op/erigon/ink-sepolia-op-erigon-archive-trace.yml
index f82fba7f..a232ff6c 100644
--- a/op/erigon/ink-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/ink-sepolia-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/ink-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/ink-sepolia-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  ink-sepolia-archive:
+  ink-sepolia-op-erigon:
     image: ${INK_ERIGON_IMAGE:-testinprod/op-erigon}:${INK_SEPOLIA_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.ink-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/ink-sepolia-archive
+      - traefik.http.middlewares.ink-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/ink-sepolia-op-erigon
       - traefik.http.services.ink-sepolia-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.ink-sepolia-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.ink-sepolia-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.ink-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ink-sepolia-archive`) || Path(`/ink-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.ink-sepolia-op-erigon-archive-trace.rule=Path(`/ink-sepolia-archive`) || Path(`/ink-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.ink-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/ink-sepolia-op-erigon`) || Path(`/ink-sepolia-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.ink-sepolia-op-erigon-archive-trace.rule=Path(`/ink-sepolia-op-erigon`) || Path(`/ink-sepolia-op-erigon/`)}
       - traefik.http.routers.ink-sepolia-op-erigon-archive-trace.middlewares=ink-sepolia-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  ink-sepolia-archive-node:
+  ink-sepolia-op-erigon-node:
     image: ${INK_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${INK_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 19826:19826
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://ink-sepolia-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://ink-sepolia-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - ink-sepolia-archive
+      - ink-sepolia-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/lisk-mainnet-op-erigon-archive-trace.yml b/op/erigon/lisk-mainnet-op-erigon-archive-trace.yml
index 07f29538..6829c3cd 100644
--- a/op/erigon/lisk-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/lisk-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/lisk-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/lisk-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  lisk-mainnet-archive:
+  lisk-mainnet-op-erigon:
     image: ${LISK_ERIGON_IMAGE:-testinprod/op-erigon}:${LISK_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -99,16 +99,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.lisk-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/lisk-mainnet-archive
+      - traefik.http.middlewares.lisk-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/lisk-mainnet-op-erigon
       - traefik.http.services.lisk-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/lisk-mainnet-archive`) || Path(`/lisk-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.lisk-mainnet-op-erigon-archive-trace.rule=Path(`/lisk-mainnet-archive`) || Path(`/lisk-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/lisk-mainnet-op-erigon`) || Path(`/lisk-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.lisk-mainnet-op-erigon-archive-trace.rule=Path(`/lisk-mainnet-op-erigon`) || Path(`/lisk-mainnet-op-erigon/`)}
       - traefik.http.routers.lisk-mainnet-op-erigon-archive-trace.middlewares=lisk-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  lisk-mainnet-archive-node:
+  lisk-mainnet-op-erigon-node:
     image: ${LISK_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${LISK_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 19831:19831
@@ -120,7 +120,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://lisk-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://lisk-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -142,7 +142,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - lisk-mainnet-archive
+      - lisk-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/metal-mainnet-op-erigon-archive-trace.yml b/op/erigon/metal-mainnet-op-erigon-archive-trace.yml
index 962b3b12..cd3f9129 100644
--- a/op/erigon/metal-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/metal-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/metal-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/metal-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  metal-mainnet-archive:
+  metal-mainnet-op-erigon:
     image: ${METAL_ERIGON_IMAGE:-testinprod/op-erigon}:${METAL_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.metal-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/metal-mainnet-archive
+      - traefik.http.middlewares.metal-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/metal-mainnet-op-erigon
       - traefik.http.services.metal-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.metal-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.metal-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.metal-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/metal-mainnet-archive`) || Path(`/metal-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.metal-mainnet-op-erigon-archive-trace.rule=Path(`/metal-mainnet-archive`) || Path(`/metal-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.metal-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/metal-mainnet-op-erigon`) || Path(`/metal-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.metal-mainnet-op-erigon-archive-trace.rule=Path(`/metal-mainnet-op-erigon`) || Path(`/metal-mainnet-op-erigon/`)}
       - traefik.http.routers.metal-mainnet-op-erigon-archive-trace.middlewares=metal-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  metal-mainnet-archive-node:
+  metal-mainnet-op-erigon-node:
     image: ${METAL_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${METAL_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 15543:15543
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://metal-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://metal-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -138,7 +138,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - metal-mainnet-archive
+      - metal-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/mode-mainnet-op-erigon-archive-trace.yml b/op/erigon/mode-mainnet-op-erigon-archive-trace.yml
index 875ef009..520a4099 100644
--- a/op/erigon/mode-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/mode-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/mode-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/mode-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  mode-mainnet-archive:
+  mode-mainnet-op-erigon:
     image: ${MODE_ERIGON_IMAGE:-testinprod/op-erigon}:${MODE_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.mode-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/mode-mainnet-archive
+      - traefik.http.middlewares.mode-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/mode-mainnet-op-erigon
       - traefik.http.services.mode-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.mode-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.mode-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.mode-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/mode-mainnet-archive`) || Path(`/mode-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.mode-mainnet-op-erigon-archive-trace.rule=Path(`/mode-mainnet-archive`) || Path(`/mode-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.mode-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/mode-mainnet-op-erigon`) || Path(`/mode-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.mode-mainnet-op-erigon-archive-trace.rule=Path(`/mode-mainnet-op-erigon`) || Path(`/mode-mainnet-op-erigon/`)}
       - traefik.http.routers.mode-mainnet-op-erigon-archive-trace.middlewares=mode-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  mode-mainnet-archive-node:
+  mode-mainnet-op-erigon-node:
     image: ${MODE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${MODE_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 17509:17509
@@ -118,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://mode-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://mode-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - mode-mainnet-archive
+      - mode-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/mode-sepolia-op-erigon-archive-trace.yml b/op/erigon/mode-sepolia-op-erigon-archive-trace.yml
index b2079e11..68871d2e 100644
--- a/op/erigon/mode-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/mode-sepolia-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/mode-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/mode-sepolia-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  mode-sepolia-archive:
+  mode-sepolia-op-erigon:
     image: ${MODE_ERIGON_IMAGE:-testinprod/op-erigon}:${MODE_SEPOLIA_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.mode-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/mode-sepolia-archive
+      - traefik.http.middlewares.mode-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/mode-sepolia-op-erigon
       - traefik.http.services.mode-sepolia-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.mode-sepolia-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.mode-sepolia-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.mode-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/mode-sepolia-archive`) || Path(`/mode-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.mode-sepolia-op-erigon-archive-trace.rule=Path(`/mode-sepolia-archive`) || Path(`/mode-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.mode-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/mode-sepolia-op-erigon`) || Path(`/mode-sepolia-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.mode-sepolia-op-erigon-archive-trace.rule=Path(`/mode-sepolia-op-erigon`) || Path(`/mode-sepolia-op-erigon/`)}
       - traefik.http.routers.mode-sepolia-op-erigon-archive-trace.middlewares=mode-sepolia-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  mode-sepolia-archive-node:
+  mode-sepolia-op-erigon-node:
     image: ${MODE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${MODE_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 18212:18212
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://mode-sepolia-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://mode-sepolia-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - mode-sepolia-archive
+      - mode-sepolia-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/op-mainnet-op-erigon-archive-trace.yml b/op/erigon/op-mainnet-op-erigon-archive-trace.yml
index 0f778e3c..10fecdb8 100644
--- a/op/erigon/op-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/op-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/op-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/op-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  op-mainnet-archive:
+  op-mainnet-op-erigon:
     image: ${OP_ERIGON_IMAGE:-testinprod/op-erigon}:${OP_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -69,7 +69,6 @@ services:
       - --p2p.allowed-ports=32509
       - --p2p.allowed-ports=37509
       - --port=12509
-      - --rollup.historicalrpc="http://op-mainnet-archive-classic:8545"
       - --rollup.sequencerhttp=https://mainnet-sequencer.optimism.io
       - --rpc.gascap=6000000000
       - --rpc.returndata.limit=1100000
@@ -85,8 +84,6 @@ services:
       - --authrpc.vhosts=*
     restart: unless-stopped
     stop_grace_period: 5m
-    depends_on:
-      - op-mainnet-archive-classic
     networks:
       - chains
     volumes:
@@ -100,16 +97,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.op-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/op-mainnet-archive
+      - traefik.http.middlewares.op-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/op-mainnet-op-erigon
       - traefik.http.services.op-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.op-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.op-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.op-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/op-mainnet-archive`) || Path(`/op-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.op-mainnet-op-erigon-archive-trace.rule=Path(`/op-mainnet-archive`) || Path(`/op-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.op-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/op-mainnet-op-erigon`) || Path(`/op-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.op-mainnet-op-erigon-archive-trace.rule=Path(`/op-mainnet-op-erigon`) || Path(`/op-mainnet-op-erigon/`)}
       - traefik.http.routers.op-mainnet-op-erigon-archive-trace.middlewares=op-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  op-mainnet-archive-node:
+  op-mainnet-op-erigon-node:
     image: ${OP_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${OP_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 17509:17509
@@ -121,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://op-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://op-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -142,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - op-mainnet-archive
+      - op-mainnet-op-erigon
     networks:
       - chains
     volumes:
@@ -154,7 +151,7 @@ services:
       - prometheus-scrape.port=7300
       - prometheus-scrape.path=/metrics
 
-  op-mainnet-archive-classic:
+  op-mainnet-l2geth-archive-classic:
     image: ${OP_L2GETH_IMAGE:-ethereumoptimism/l2geth}:${OP_MAINNET_L2GETH_VERSION:-0.5.31}
     sysctls:
       # TCP Performance
diff --git a/op/erigon/op-sepolia-op-erigon-archive-trace.yml b/op/erigon/op-sepolia-op-erigon-archive-trace.yml
index 0db744cd..cf4e416e 100644
--- a/op/erigon/op-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/op-sepolia-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/op-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/op-sepolia-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  op-sepolia-archive:
+  op-sepolia-op-erigon:
     image: ${OP_ERIGON_IMAGE:-testinprod/op-erigon}:${OP_SEPOLIA_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.op-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/op-sepolia-archive
+      - traefik.http.middlewares.op-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/op-sepolia-op-erigon
       - traefik.http.services.op-sepolia-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.op-sepolia-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.op-sepolia-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.op-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/op-sepolia-archive`) || Path(`/op-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.op-sepolia-op-erigon-archive-trace.rule=Path(`/op-sepolia-archive`) || Path(`/op-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.op-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/op-sepolia-op-erigon`) || Path(`/op-sepolia-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.op-sepolia-op-erigon-archive-trace.rule=Path(`/op-sepolia-op-erigon`) || Path(`/op-sepolia-op-erigon/`)}
       - traefik.http.routers.op-sepolia-op-erigon-archive-trace.middlewares=op-sepolia-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  op-sepolia-archive-node:
+  op-sepolia-op-erigon-node:
     image: ${OP_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${OP_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 15373:15373
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://op-sepolia-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://op-sepolia-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - op-sepolia-archive
+      - op-sepolia-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/snax-mainnet-op-erigon-archive-trace.yml b/op/erigon/snax-mainnet-op-erigon-archive-trace.yml
index 99c9a2e4..e0b11583 100644
--- a/op/erigon/snax-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/snax-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/snax-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/snax-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  snax-mainnet-archive:
+  snax-mainnet-op-erigon:
     image: ${SNAX_ERIGON_IMAGE:-testinprod/op-erigon}:${SNAX_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.snax-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/snax-mainnet-archive
+      - traefik.http.middlewares.snax-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/snax-mainnet-op-erigon
       - traefik.http.services.snax-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.snax-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.snax-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.snax-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/snax-mainnet-archive`) || Path(`/snax-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.snax-mainnet-op-erigon-archive-trace.rule=Path(`/snax-mainnet-archive`) || Path(`/snax-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.snax-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/snax-mainnet-op-erigon`) || Path(`/snax-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.snax-mainnet-op-erigon-archive-trace.rule=Path(`/snax-mainnet-op-erigon`) || Path(`/snax-mainnet-op-erigon/`)}
       - traefik.http.routers.snax-mainnet-op-erigon-archive-trace.middlewares=snax-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  snax-mainnet-archive-node:
+  snax-mainnet-op-erigon-node:
     image: ${SNAX_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${SNAX_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 19671:19671
@@ -118,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://snax-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://snax-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - snax-mainnet-archive
+      - snax-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/soneium-minato-op-erigon-archive-trace.yml b/op/erigon/soneium-minato-op-erigon-archive-trace.yml
index 82cd6d72..0d7899ec 100644
--- a/op/erigon/soneium-minato-op-erigon-archive-trace.yml
+++ b/op/erigon/soneium-minato-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/soneium-minato-archive \
+# curl -X POST https://${IP}.traefik.me/soneium-minato-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  soneium-minato-archive:
+  soneium-minato-op-erigon:
     image: ${SONEIUM_ERIGON_IMAGE:-testinprod/op-erigon}:${SONEIUM_MINATO_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.soneium-minato-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/soneium-minato-archive
+      - traefik.http.middlewares.soneium-minato-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/soneium-minato-op-erigon
       - traefik.http.services.soneium-minato-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.soneium-minato-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.soneium-minato-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.soneium-minato-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/soneium-minato-archive`) || Path(`/soneium-minato-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.soneium-minato-op-erigon-archive-trace.rule=Path(`/soneium-minato-archive`) || Path(`/soneium-minato-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.soneium-minato-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/soneium-minato-op-erigon`) || Path(`/soneium-minato-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.soneium-minato-op-erigon-archive-trace.rule=Path(`/soneium-minato-op-erigon`) || Path(`/soneium-minato-op-erigon/`)}
       - traefik.http.routers.soneium-minato-op-erigon-archive-trace.middlewares=soneium-minato-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  soneium-minato-archive-node:
+  soneium-minato-op-erigon-node:
     image: ${SONEIUM_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${SONEIUM_MINATO_NODE_VERSION:-v1.13.2}
     ports:
       - 18314:18314
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://soneium-minato-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://soneium-minato-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - soneium-minato-archive
+      - soneium-minato-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/swell-mainnet-op-erigon-archive-trace.yml b/op/erigon/swell-mainnet-op-erigon-archive-trace.yml
index 2238c76a..fc72c633 100644
--- a/op/erigon/swell-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/swell-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/swell-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/swell-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  swell-mainnet-archive:
+  swell-mainnet-op-erigon:
     image: ${SWELL_ERIGON_IMAGE:-testinprod/op-erigon}:${SWELL_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.swell-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/swell-mainnet-archive
+      - traefik.http.middlewares.swell-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/swell-mainnet-op-erigon
       - traefik.http.services.swell-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.swell-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.swell-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.swell-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/swell-mainnet-archive`) || Path(`/swell-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.swell-mainnet-op-erigon-archive-trace.rule=Path(`/swell-mainnet-archive`) || Path(`/swell-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.swell-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/swell-mainnet-op-erigon`) || Path(`/swell-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.swell-mainnet-op-erigon-archive-trace.rule=Path(`/swell-mainnet-op-erigon`) || Path(`/swell-mainnet-op-erigon/`)}
       - traefik.http.routers.swell-mainnet-op-erigon-archive-trace.middlewares=swell-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  swell-mainnet-archive-node:
+  swell-mainnet-op-erigon-node:
     image: ${SWELL_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${SWELL_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 15810:15810
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://swell-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://swell-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -138,7 +138,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - swell-mainnet-archive
+      - swell-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/unichain-mainnet-op-erigon-archive-trace.yml b/op/erigon/unichain-mainnet-op-erigon-archive-trace.yml
index 39f3f442..8ce65b2a 100644
--- a/op/erigon/unichain-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/unichain-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/unichain-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/unichain-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  unichain-mainnet-archive:
+  unichain-mainnet-op-erigon:
     image: ${UNICHAIN_ERIGON_IMAGE:-testinprod/op-erigon}:${UNICHAIN_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.unichain-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/unichain-mainnet-archive
+      - traefik.http.middlewares.unichain-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/unichain-mainnet-op-erigon
       - traefik.http.services.unichain-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.unichain-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.unichain-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.unichain-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/unichain-mainnet-archive`) || Path(`/unichain-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.unichain-mainnet-op-erigon-archive-trace.rule=Path(`/unichain-mainnet-archive`) || Path(`/unichain-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.unichain-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/unichain-mainnet-op-erigon`) || Path(`/unichain-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.unichain-mainnet-op-erigon-archive-trace.rule=Path(`/unichain-mainnet-op-erigon`) || Path(`/unichain-mainnet-op-erigon/`)}
       - traefik.http.routers.unichain-mainnet-op-erigon-archive-trace.middlewares=unichain-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  unichain-mainnet-archive-node:
+  unichain-mainnet-op-erigon-node:
     image: ${UNICHAIN_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${UNICHAIN_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 16415:16415
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://unichain-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://unichain-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -138,7 +138,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - unichain-mainnet-archive
+      - unichain-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/unichain-sepolia-op-erigon-archive-trace.yml b/op/erigon/unichain-sepolia-op-erigon-archive-trace.yml
index 69b7ebf0..69680b81 100644
--- a/op/erigon/unichain-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/unichain-sepolia-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/unichain-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/unichain-sepolia-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  unichain-sepolia-archive:
+  unichain-sepolia-op-erigon:
     image: ${UNICHAIN_ERIGON_IMAGE:-testinprod/op-erigon}:${UNICHAIN_SEPOLIA_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.unichain-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/unichain-sepolia-archive
+      - traefik.http.middlewares.unichain-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/unichain-sepolia-op-erigon
       - traefik.http.services.unichain-sepolia-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.unichain-sepolia-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.unichain-sepolia-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.unichain-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/unichain-sepolia-archive`) || Path(`/unichain-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.unichain-sepolia-op-erigon-archive-trace.rule=Path(`/unichain-sepolia-archive`) || Path(`/unichain-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.unichain-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/unichain-sepolia-op-erigon`) || Path(`/unichain-sepolia-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.unichain-sepolia-op-erigon-archive-trace.rule=Path(`/unichain-sepolia-op-erigon`) || Path(`/unichain-sepolia-op-erigon/`)}
       - traefik.http.routers.unichain-sepolia-op-erigon-archive-trace.middlewares=unichain-sepolia-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  unichain-sepolia-archive-node:
+  unichain-sepolia-op-erigon-node:
     image: ${UNICHAIN_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${UNICHAIN_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 18196:18196
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://unichain-sepolia-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://unichain-sepolia-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - unichain-sepolia-archive
+      - unichain-sepolia-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/worldchain-mainnet-op-erigon-archive-trace.yml b/op/erigon/worldchain-mainnet-op-erigon-archive-trace.yml
index 1a89e250..26f58ab1 100644
--- a/op/erigon/worldchain-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/worldchain-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/worldchain-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/worldchain-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  worldchain-mainnet-archive:
+  worldchain-mainnet-op-erigon:
     image: ${WORLDCHAIN_ERIGON_IMAGE:-testinprod/op-erigon}:${WORLDCHAIN_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.worldchain-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/worldchain-mainnet-archive
+      - traefik.http.middlewares.worldchain-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/worldchain-mainnet-op-erigon
       - traefik.http.services.worldchain-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/worldchain-mainnet-archive`) || Path(`/worldchain-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.worldchain-mainnet-op-erigon-archive-trace.rule=Path(`/worldchain-mainnet-archive`) || Path(`/worldchain-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.worldchain-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/worldchain-mainnet-op-erigon`) || Path(`/worldchain-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.worldchain-mainnet-op-erigon-archive-trace.rule=Path(`/worldchain-mainnet-op-erigon`) || Path(`/worldchain-mainnet-op-erigon/`)}
       - traefik.http.routers.worldchain-mainnet-op-erigon-archive-trace.middlewares=worldchain-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  worldchain-mainnet-archive-node:
+  worldchain-mainnet-op-erigon-node:
     image: ${WORLDCHAIN_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${WORLDCHAIN_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 16629:16629
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://worldchain-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://worldchain-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -138,7 +138,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - worldchain-mainnet-archive
+      - worldchain-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/worldchain-sepolia-op-erigon-archive-trace.yml b/op/erigon/worldchain-sepolia-op-erigon-archive-trace.yml
index c88d1f7f..cd574e11 100644
--- a/op/erigon/worldchain-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/worldchain-sepolia-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/worldchain-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/worldchain-sepolia-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  worldchain-sepolia-archive:
+  worldchain-sepolia-op-erigon:
     image: ${WORLDCHAIN_ERIGON_IMAGE:-testinprod/op-erigon}:${WORLDCHAIN_SEPOLIA_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.worldchain-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/worldchain-sepolia-archive
+      - traefik.http.middlewares.worldchain-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/worldchain-sepolia-op-erigon
       - traefik.http.services.worldchain-sepolia-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.worldchain-sepolia-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.worldchain-sepolia-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.worldchain-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/worldchain-sepolia-archive`) || Path(`/worldchain-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.worldchain-sepolia-op-erigon-archive-trace.rule=Path(`/worldchain-sepolia-archive`) || Path(`/worldchain-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.worldchain-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/worldchain-sepolia-op-erigon`) || Path(`/worldchain-sepolia-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.worldchain-sepolia-op-erigon-archive-trace.rule=Path(`/worldchain-sepolia-op-erigon`) || Path(`/worldchain-sepolia-op-erigon/`)}
       - traefik.http.routers.worldchain-sepolia-op-erigon-archive-trace.middlewares=worldchain-sepolia-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  worldchain-sepolia-archive-node:
+  worldchain-sepolia-op-erigon-node:
     image: ${WORLDCHAIN_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${WORLDCHAIN_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 16046:16046
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://worldchain-sepolia-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://worldchain-sepolia-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - worldchain-sepolia-archive
+      - worldchain-sepolia-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/zora-mainnet-op-erigon-archive-trace.yml b/op/erigon/zora-mainnet-op-erigon-archive-trace.yml
index f17db781..02dbf2a3 100644
--- a/op/erigon/zora-mainnet-op-erigon-archive-trace.yml
+++ b/op/erigon/zora-mainnet-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/zora-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/zora-mainnet-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  zora-mainnet-archive:
+  zora-mainnet-op-erigon:
     image: ${ZORA_ERIGON_IMAGE:-testinprod/op-erigon}:${ZORA_MAINNET_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.zora-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/zora-mainnet-archive
+      - traefik.http.middlewares.zora-mainnet-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/zora-mainnet-op-erigon
       - traefik.http.services.zora-mainnet-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.zora-mainnet-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.zora-mainnet-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.zora-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/zora-mainnet-archive`) || Path(`/zora-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.zora-mainnet-op-erigon-archive-trace.rule=Path(`/zora-mainnet-archive`) || Path(`/zora-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.zora-mainnet-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/zora-mainnet-op-erigon`) || Path(`/zora-mainnet-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.zora-mainnet-op-erigon-archive-trace.rule=Path(`/zora-mainnet-op-erigon`) || Path(`/zora-mainnet-op-erigon/`)}
       - traefik.http.routers.zora-mainnet-op-erigon-archive-trace.middlewares=zora-mainnet-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  zora-mainnet-archive-node:
+  zora-mainnet-op-erigon-node:
     image: ${ZORA_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${ZORA_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 19360:19360
@@ -118,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://zora-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://zora-mainnet-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - zora-mainnet-archive
+      - zora-mainnet-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/erigon/zora-sepolia-op-erigon-archive-trace.yml b/op/erigon/zora-sepolia-op-erigon-archive-trace.yml
index 6f316522..339a4ab9 100644
--- a/op/erigon/zora-sepolia-op-erigon-archive-trace.yml
+++ b/op/erigon/zora-sepolia-op-erigon-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/zora-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/zora-sepolia-op-erigon \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  zora-sepolia-archive:
+  zora-sepolia-op-erigon:
     image: ${ZORA_ERIGON_IMAGE:-testinprod/op-erigon}:${ZORA_SEPOLIA_ERIGON_VERSION:-v2.61.1-0.8.3}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.zora-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/zora-sepolia-archive
+      - traefik.http.middlewares.zora-sepolia-op-erigon-archive-trace-stripprefix.stripprefix.prefixes=/zora-sepolia-op-erigon
       - traefik.http.services.zora-sepolia-op-erigon-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.zora-sepolia-op-erigon-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.zora-sepolia-op-erigon-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.zora-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/zora-sepolia-archive`) || Path(`/zora-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.zora-sepolia-op-erigon-archive-trace.rule=Path(`/zora-sepolia-archive`) || Path(`/zora-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.zora-sepolia-op-erigon-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/zora-sepolia-op-erigon`) || Path(`/zora-sepolia-op-erigon/`))}
+      - ${NO_SSL:+traefik.http.routers.zora-sepolia-op-erigon-archive-trace.rule=Path(`/zora-sepolia-op-erigon`) || Path(`/zora-sepolia-op-erigon/`)}
       - traefik.http.routers.zora-sepolia-op-erigon-archive-trace.middlewares=zora-sepolia-op-erigon-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  zora-sepolia-archive-node:
+  zora-sepolia-op-erigon-node:
     image: ${ZORA_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${ZORA_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 18839:18839
@@ -118,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://zora-sepolia-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://zora-sepolia-op-erigon:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -140,7 +140,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - zora-sepolia-archive
+      - zora-sepolia-op-erigon
     networks:
       - chains
     volumes:
diff --git a/op/geth/celo-alfajores-op-geth-archive-leveldb-hash.yml b/op/geth/celo-alfajores-op-geth-archive-leveldb-hash.yml
index 788d1eb8..1b8cbd7e 100644
--- a/op/geth/celo-alfajores-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/celo-alfajores-op-geth-archive-leveldb-hash.yml
@@ -71,7 +71,6 @@ services:
       - --nat=extip:${IP}
       - --networkid=44787
       - --port=10895
-      - --rollup.historicalrpc=http://celo-alfajores-archive-classic:8545
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
       - --state.scheme=hash
@@ -91,8 +90,6 @@ services:
       - --authrpc.vhosts=*
     restart: unless-stopped
     stop_grace_period: 5m
-    depends_on:
-      - celo-alfajores-archive-classic
     networks:
       - chains
     volumes:
diff --git a/op/geth/celo-alfajores-op-geth-pruned-leveldb-hash.yml b/op/geth/celo-alfajores-op-geth-pruned-leveldb-hash.yml
index c954653f..0cbb0fe6 100644
--- a/op/geth/celo-alfajores-op-geth-pruned-leveldb-hash.yml
+++ b/op/geth/celo-alfajores-op-geth-pruned-leveldb-hash.yml
@@ -71,7 +71,6 @@ services:
       - --nat=extip:${IP}
       - --networkid=44787
       - --port=11649
-      - --rollup.historicalrpc=http://celo-alfajores-classic:8545
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
       - --state.scheme=hash
@@ -91,8 +90,6 @@ services:
       - --authrpc.vhosts=*
     restart: unless-stopped
     stop_grace_period: 5m
-    depends_on:
-      - celo-alfajores-classic
     networks:
       - chains
     volumes:
diff --git a/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
index 5bdee50d..cdb85658 100644
--- a/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/celo-mainnet-op-geth-archive-leveldb-hash.yml
@@ -71,7 +71,6 @@ services:
       - --nat=extip:${IP}
       - --networkid=42220
       - --port=12111
-      - --rollup.historicalrpc=http://celo-mainnet-archive-classic:8545
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
       - --state.scheme=hash
@@ -91,8 +90,6 @@ services:
       - --authrpc.vhosts=*
     restart: unless-stopped
     stop_grace_period: 5m
-    depends_on:
-      - celo-mainnet-archive-classic
     networks:
       - chains
     volumes:
diff --git a/op/geth/celo-mainnet-op-geth-pruned-leveldb-hash.yml b/op/geth/celo-mainnet-op-geth-pruned-leveldb-hash.yml
index 557996c7..7bfa8f11 100644
--- a/op/geth/celo-mainnet-op-geth-pruned-leveldb-hash.yml
+++ b/op/geth/celo-mainnet-op-geth-pruned-leveldb-hash.yml
@@ -71,7 +71,6 @@ services:
       - --nat=extip:${IP}
       - --networkid=42220
       - --port=14087
-      - --rollup.historicalrpc=http://celo-mainnet-classic:8545
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
       - --state.scheme=hash
@@ -91,8 +90,6 @@ services:
       - --authrpc.vhosts=*
     restart: unless-stopped
     stop_grace_period: 5m
-    depends_on:
-      - celo-mainnet-classic
     networks:
       - chains
     volumes:
diff --git a/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml b/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
index 9434f8e9..7dfec409 100644
--- a/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
+++ b/op/geth/op-mainnet-op-geth-archive-leveldb-hash.yml
@@ -67,7 +67,6 @@ services:
       - --metrics.port=6060
       - --nat=extip:${IP}
       - --port=13399
-      - --rollup.historicalrpc=http://op-mainnet-archive-classic:8545
       - --rpc.gascap=600000000
       - --rpc.txfeecap=0
       - --state.scheme=hash
@@ -87,8 +86,6 @@ services:
       - --authrpc.vhosts=*
     restart: unless-stopped
     stop_grace_period: 5m
-    depends_on:
-      - op-mainnet-archive-classic
     networks:
       - chains
     volumes:
@@ -155,7 +152,7 @@ services:
       - prometheus-scrape.port=7300
       - prometheus-scrape.path=/metrics
 
-  op-mainnet-archive-classic:
+  op-mainnet-l2geth-archive-classic:
     image: ${OP_L2GETH_IMAGE:-ethereumoptimism/l2geth}:${OP_MAINNET_L2GETH_VERSION:-0.5.31}
     sysctls:
       # TCP Performance
diff --git a/op/l2geth/op-mainnet-l2geth-archive-leveldb-hash.yml b/op/l2geth/op-mainnet-l2geth-archive-leveldb-hash.yml
index 24eeffbc..0fda1de1 100644
--- a/op/l2geth/op-mainnet-l2geth-archive-leveldb-hash.yml
+++ b/op/l2geth/op-mainnet-l2geth-archive-leveldb-hash.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/op-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/op-mainnet-l2geth-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  op-mainnet-archive:
+  op-mainnet-l2geth-archive:
     image: ${OP_L2GETH_IMAGE:-ethereumoptimism/l2geth}:${OP_MAINNET_L2GETH_VERSION:-0.5.31}
     sysctls:
       # TCP Performance
@@ -93,12 +93,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.op-mainnet-l2geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/op-mainnet-archive
+      - traefik.http.middlewares.op-mainnet-l2geth-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/op-mainnet-l2geth-archive
       - traefik.http.services.op-mainnet-l2geth-archive-leveldb-hash.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.op-mainnet-l2geth-archive-leveldb-hash.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.op-mainnet-l2geth-archive-leveldb-hash.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.op-mainnet-l2geth-archive-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/op-mainnet-archive`) || Path(`/op-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.op-mainnet-l2geth-archive-leveldb-hash.rule=Path(`/op-mainnet-archive`) || Path(`/op-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.op-mainnet-l2geth-archive-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/op-mainnet-l2geth-archive`) || Path(`/op-mainnet-l2geth-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.op-mainnet-l2geth-archive-leveldb-hash.rule=Path(`/op-mainnet-l2geth-archive`) || Path(`/op-mainnet-l2geth-archive/`)}
       - traefik.http.routers.op-mainnet-l2geth-archive-leveldb-hash.middlewares=op-mainnet-l2geth-archive-leveldb-hash-stripprefix, ipallowlist
 
 volumes:
diff --git a/op/reth/base-mainnet-op-reth-archive-trace.yml b/op/reth/base-mainnet-op-reth-archive-trace.yml
index 89948c8b..473b0e7f 100644
--- a/op/reth/base-mainnet-op-reth-archive-trace.yml
+++ b/op/reth/base-mainnet-op-reth-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/base-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/base-mainnet-op-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  base-mainnet-archive:
+  base-mainnet-op-reth:
     image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.base-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/base-mainnet-archive
+      - traefik.http.middlewares.base-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/base-mainnet-op-reth
       - traefik.http.services.base-mainnet-op-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet-archive`) || Path(`/base-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-reth-archive-trace.rule=Path(`/base-mainnet-archive`) || Path(`/base-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet-op-reth`) || Path(`/base-mainnet-op-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-reth-archive-trace.rule=Path(`/base-mainnet-op-reth`) || Path(`/base-mainnet-op-reth/`)}
       - traefik.http.routers.base-mainnet-op-reth-archive-trace.middlewares=base-mainnet-op-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  base-mainnet-archive-node:
+  base-mainnet-op-reth-node:
     image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 19221:19221
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -138,7 +138,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - base-mainnet-archive
+      - base-mainnet-op-reth
     networks:
       - chains
     volumes:
diff --git a/op/reth/base-mainnet-op-reth-minimal-trace--benchmark.yml b/op/reth/base-mainnet-op-reth-minimal-trace--benchmark.yml
index 675a5d4e..1d6fe783 100644
--- a/op/reth/base-mainnet-op-reth-minimal-trace--benchmark.yml
+++ b/op/reth/base-mainnet-op-reth-minimal-trace--benchmark.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/base-mainnet-minimal \
+# curl -X POST https://${IP}.traefik.me/base-mainnet-op-reth-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  base-mainnet-minimal:
+  base-mainnet-op-reth-minimal:
     image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -97,7 +97,7 @@ services:
       - prometheus-scrape.path=/metrics
     shm_size: 2gb
 
-  base-mainnet-minimal-benchmark:
+  base-mainnet-op-reth-minimal-benchmark:
     build:
       context: ./benchmark-proxy
       dockerfile: Dockerfile
@@ -106,26 +106,26 @@ services:
     environment:
       - ENABLE_DETAILED_LOGS=${BENCHMARK_PROXY_VERBOSE:-false}
       - LISTEN_ADDR=:8545
-      - PRIMARY_BACKEND=http://base-mainnet-minimal:8545
+      - PRIMARY_BACKEND=http://base-mainnet-op-reth-minimal:8545
       - SUMMARY_INTERVAL=60
     restart: unless-stopped
     depends_on:
-      - base-mainnet-minimal
+      - base-mainnet-op-reth-minimal
     networks:
       - chains
     logging: *logging-defaults
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.base-mainnet-op-reth-minimal-trace-stripprefix.stripprefix.prefixes=/base-mainnet-minimal
+      - traefik.http.middlewares.base-mainnet-op-reth-minimal-trace-stripprefix.stripprefix.prefixes=/base-mainnet-op-reth-minimal
       - traefik.http.services.base-mainnet-op-reth-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet-minimal`) || Path(`/base-mainnet-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-reth-minimal-trace.rule=Path(`/base-mainnet-minimal`) || Path(`/base-mainnet-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet-op-reth-minimal`) || Path(`/base-mainnet-op-reth-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-reth-minimal-trace.rule=Path(`/base-mainnet-op-reth-minimal`) || Path(`/base-mainnet-op-reth-minimal/`)}
       - traefik.http.routers.base-mainnet-op-reth-minimal-trace.middlewares=base-mainnet-op-reth-minimal-trace-stripprefix, ipallowlist
 
-  base-mainnet-minimal-node:
+  base-mainnet-op-reth-minimal-node:
     image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 16240:16240
@@ -137,7 +137,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-minimal:8551
+      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth-minimal:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -158,7 +158,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - base-mainnet-minimal
+      - base-mainnet-op-reth-minimal
     networks:
       - chains
     volumes:
diff --git a/op/reth/base-mainnet-op-reth-minimal-trace.yml b/op/reth/base-mainnet-op-reth-minimal-trace.yml
index 5e79fa89..21746672 100644
--- a/op/reth/base-mainnet-op-reth-minimal-trace.yml
+++ b/op/reth/base-mainnet-op-reth-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/base-mainnet-minimal \
+# curl -X POST https://${IP}.traefik.me/base-mainnet-op-reth-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  base-mainnet-minimal:
+  base-mainnet-op-reth-minimal:
     image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.base-mainnet-op-reth-minimal-trace-stripprefix.stripprefix.prefixes=/base-mainnet-minimal
+      - traefik.http.middlewares.base-mainnet-op-reth-minimal-trace-stripprefix.stripprefix.prefixes=/base-mainnet-op-reth-minimal
       - traefik.http.services.base-mainnet-op-reth-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet-minimal`) || Path(`/base-mainnet-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-reth-minimal-trace.rule=Path(`/base-mainnet-minimal`) || Path(`/base-mainnet-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet-op-reth-minimal`) || Path(`/base-mainnet-op-reth-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-reth-minimal-trace.rule=Path(`/base-mainnet-op-reth-minimal`) || Path(`/base-mainnet-op-reth-minimal/`)}
       - traefik.http.routers.base-mainnet-op-reth-minimal-trace.middlewares=base-mainnet-op-reth-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  base-mainnet-minimal-node:
+  base-mainnet-op-reth-minimal-node:
     image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 16240:16240
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-minimal:8551
+      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth-minimal:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -138,7 +138,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - base-mainnet-minimal
+      - base-mainnet-op-reth-minimal
     networks:
       - chains
     volumes:
diff --git a/op/reth/base-mainnet-op-reth-pruned-trace--benchmark.yml b/op/reth/base-mainnet-op-reth-pruned-trace--benchmark.yml
index 5eaca854..66242744 100644
--- a/op/reth/base-mainnet-op-reth-pruned-trace--benchmark.yml
+++ b/op/reth/base-mainnet-op-reth-pruned-trace--benchmark.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/base-mainnet \
+# curl -X POST https://${IP}.traefik.me/base-mainnet-op-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  base-mainnet:
+  base-mainnet-op-reth-pruned:
     image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -98,7 +98,7 @@ services:
       - prometheus-scrape.path=/metrics
     shm_size: 2gb
 
-  base-mainnet-benchmark:
+  base-mainnet-op-reth-pruned-benchmark:
     build:
       context: ./benchmark-proxy
       dockerfile: Dockerfile
@@ -107,26 +107,26 @@ services:
     environment:
       - ENABLE_DETAILED_LOGS=${BENCHMARK_PROXY_VERBOSE:-false}
       - LISTEN_ADDR=:8545
-      - PRIMARY_BACKEND=http://base-mainnet:8545
+      - PRIMARY_BACKEND=http://base-mainnet-op-reth-pruned:8545
       - SUMMARY_INTERVAL=60
     restart: unless-stopped
     depends_on:
-      - base-mainnet
+      - base-mainnet-op-reth-pruned
     networks:
       - chains
     logging: *logging-defaults
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.base-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/base-mainnet
+      - traefik.http.middlewares.base-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/base-mainnet-op-reth-pruned
       - traefik.http.services.base-mainnet-op-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet`) || Path(`/base-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-reth-pruned-trace.rule=Path(`/base-mainnet`) || Path(`/base-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet-op-reth-pruned`) || Path(`/base-mainnet-op-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-reth-pruned-trace.rule=Path(`/base-mainnet-op-reth-pruned`) || Path(`/base-mainnet-op-reth-pruned/`)}
       - traefik.http.routers.base-mainnet-op-reth-pruned-trace.middlewares=base-mainnet-op-reth-pruned-trace-stripprefix, ipallowlist
 
-  base-mainnet-node:
+  base-mainnet-op-reth-pruned-node:
     image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 19759:19759
@@ -138,7 +138,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet:8551
+      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth-pruned:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -159,7 +159,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - base-mainnet
+      - base-mainnet-op-reth-pruned
     networks:
       - chains
     volumes:
diff --git a/op/reth/base-mainnet-op-reth-pruned-trace.yml b/op/reth/base-mainnet-op-reth-pruned-trace.yml
index 9f49429a..2df53db9 100644
--- a/op/reth/base-mainnet-op-reth-pruned-trace.yml
+++ b/op/reth/base-mainnet-op-reth-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/base-mainnet \
+# curl -X POST https://${IP}.traefik.me/base-mainnet-op-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  base-mainnet:
+  base-mainnet-op-reth-pruned:
     image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.base-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/base-mainnet
+      - traefik.http.middlewares.base-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/base-mainnet-op-reth-pruned
       - traefik.http.services.base-mainnet-op-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet`) || Path(`/base-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-reth-pruned-trace.rule=Path(`/base-mainnet`) || Path(`/base-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.base-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/base-mainnet-op-reth-pruned`) || Path(`/base-mainnet-op-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.base-mainnet-op-reth-pruned-trace.rule=Path(`/base-mainnet-op-reth-pruned`) || Path(`/base-mainnet-op-reth-pruned/`)}
       - traefik.http.routers.base-mainnet-op-reth-pruned-trace.middlewares=base-mainnet-op-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  base-mainnet-node:
+  base-mainnet-op-reth-pruned-node:
     image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 19759:19759
@@ -118,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet:8551
+      - OP_NODE_L2_ENGINE_RPC=http://base-mainnet-op-reth-pruned:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - base-mainnet
+      - base-mainnet-op-reth-pruned
     networks:
       - chains
     volumes:
diff --git a/op/reth/base-sepolia-op-reth-archive-trace.yml b/op/reth/base-sepolia-op-reth-archive-trace.yml
index 5aa00b7c..b3b188d4 100644
--- a/op/reth/base-sepolia-op-reth-archive-trace.yml
+++ b/op/reth/base-sepolia-op-reth-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/base-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/base-sepolia-op-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  base-sepolia-archive:
+  base-sepolia-op-reth:
     image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_SEPOLIA_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.base-sepolia-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/base-sepolia-archive
+      - traefik.http.middlewares.base-sepolia-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/base-sepolia-op-reth
       - traefik.http.services.base-sepolia-op-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/base-sepolia-archive`) || Path(`/base-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.base-sepolia-op-reth-archive-trace.rule=Path(`/base-sepolia-archive`) || Path(`/base-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/base-sepolia-op-reth`) || Path(`/base-sepolia-op-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.base-sepolia-op-reth-archive-trace.rule=Path(`/base-sepolia-op-reth`) || Path(`/base-sepolia-op-reth/`)}
       - traefik.http.routers.base-sepolia-op-reth-archive-trace.middlewares=base-sepolia-op-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  base-sepolia-archive-node:
+  base-sepolia-op-reth-node:
     image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 16390:16390
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-op-reth:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - base-sepolia-archive
+      - base-sepolia-op-reth
     networks:
       - chains
     volumes:
diff --git a/op/reth/base-sepolia-op-reth-minimal-trace.yml b/op/reth/base-sepolia-op-reth-minimal-trace.yml
index b6a74977..1fe6f4e4 100644
--- a/op/reth/base-sepolia-op-reth-minimal-trace.yml
+++ b/op/reth/base-sepolia-op-reth-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/base-sepolia-minimal \
+# curl -X POST https://${IP}.traefik.me/base-sepolia-op-reth-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  base-sepolia-minimal:
+  base-sepolia-op-reth-minimal:
     image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_SEPOLIA_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.base-sepolia-op-reth-minimal-trace-stripprefix.stripprefix.prefixes=/base-sepolia-minimal
+      - traefik.http.middlewares.base-sepolia-op-reth-minimal-trace-stripprefix.stripprefix.prefixes=/base-sepolia-op-reth-minimal
       - traefik.http.services.base-sepolia-op-reth-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/base-sepolia-minimal`) || Path(`/base-sepolia-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.base-sepolia-op-reth-minimal-trace.rule=Path(`/base-sepolia-minimal`) || Path(`/base-sepolia-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/base-sepolia-op-reth-minimal`) || Path(`/base-sepolia-op-reth-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.base-sepolia-op-reth-minimal-trace.rule=Path(`/base-sepolia-op-reth-minimal`) || Path(`/base-sepolia-op-reth-minimal/`)}
       - traefik.http.routers.base-sepolia-op-reth-minimal-trace.middlewares=base-sepolia-op-reth-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  base-sepolia-minimal-node:
+  base-sepolia-op-reth-minimal-node:
     image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 17165:17165
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-minimal:8551
+      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-op-reth-minimal:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - base-sepolia-minimal
+      - base-sepolia-op-reth-minimal
     networks:
       - chains
     volumes:
diff --git a/op/reth/base-sepolia-op-reth-pruned-trace.yml b/op/reth/base-sepolia-op-reth-pruned-trace.yml
index f1b7e650..3dc92558 100644
--- a/op/reth/base-sepolia-op-reth-pruned-trace.yml
+++ b/op/reth/base-sepolia-op-reth-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/base-sepolia \
+# curl -X POST https://${IP}.traefik.me/base-sepolia-op-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  base-sepolia:
+  base-sepolia-op-reth-pruned:
     image: ${BASE_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${BASE_SEPOLIA_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.base-sepolia-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/base-sepolia
+      - traefik.http.middlewares.base-sepolia-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/base-sepolia-op-reth-pruned
       - traefik.http.services.base-sepolia-op-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/base-sepolia`) || Path(`/base-sepolia/`))}
-      - ${NO_SSL:+traefik.http.routers.base-sepolia-op-reth-pruned-trace.rule=Path(`/base-sepolia`) || Path(`/base-sepolia/`)}
+      - ${NO_SSL:-traefik.http.routers.base-sepolia-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/base-sepolia-op-reth-pruned`) || Path(`/base-sepolia-op-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.base-sepolia-op-reth-pruned-trace.rule=Path(`/base-sepolia-op-reth-pruned`) || Path(`/base-sepolia-op-reth-pruned/`)}
       - traefik.http.routers.base-sepolia-op-reth-pruned-trace.middlewares=base-sepolia-op-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  base-sepolia-node:
+  base-sepolia-op-reth-pruned-node:
     image: ${BASE_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${BASE_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 16147:16147
@@ -118,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia:8551
+      - OP_NODE_L2_ENGINE_RPC=http://base-sepolia-op-reth-pruned:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -140,7 +140,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - base-sepolia
+      - base-sepolia-op-reth-pruned
     networks:
       - chains
     volumes:
diff --git a/op/reth/lisk-mainnet-op-reth-archive-trace.yml b/op/reth/lisk-mainnet-op-reth-archive-trace.yml
index 16692a00..7d47a0c7 100644
--- a/op/reth/lisk-mainnet-op-reth-archive-trace.yml
+++ b/op/reth/lisk-mainnet-op-reth-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/lisk-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/lisk-mainnet-op-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  lisk-mainnet-archive:
+  lisk-mainnet-op-reth:
     image: ${LISK_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${LISK_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -98,16 +98,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.lisk-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/lisk-mainnet-archive
+      - traefik.http.middlewares.lisk-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/lisk-mainnet-op-reth
       - traefik.http.services.lisk-mainnet-op-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/lisk-mainnet-archive`) || Path(`/lisk-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.lisk-mainnet-op-reth-archive-trace.rule=Path(`/lisk-mainnet-archive`) || Path(`/lisk-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/lisk-mainnet-op-reth`) || Path(`/lisk-mainnet-op-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.lisk-mainnet-op-reth-archive-trace.rule=Path(`/lisk-mainnet-op-reth`) || Path(`/lisk-mainnet-op-reth/`)}
       - traefik.http.routers.lisk-mainnet-op-reth-archive-trace.middlewares=lisk-mainnet-op-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  lisk-mainnet-archive-node:
+  lisk-mainnet-op-reth-node:
     image: ${LISK_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${LISK_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 15598:15598
@@ -119,7 +119,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://lisk-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://lisk-mainnet-op-reth:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -141,7 +141,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - lisk-mainnet-archive
+      - lisk-mainnet-op-reth
     networks:
       - chains
     volumes:
diff --git a/op/reth/lisk-mainnet-op-reth-pruned-trace.yml b/op/reth/lisk-mainnet-op-reth-pruned-trace.yml
index a120021b..8074a2fd 100644
--- a/op/reth/lisk-mainnet-op-reth-pruned-trace.yml
+++ b/op/reth/lisk-mainnet-op-reth-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/lisk-mainnet \
+# curl -X POST https://${IP}.traefik.me/lisk-mainnet-op-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  lisk-mainnet:
+  lisk-mainnet-op-reth-pruned:
     image: ${LISK_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${LISK_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -99,16 +99,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.lisk-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/lisk-mainnet
+      - traefik.http.middlewares.lisk-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/lisk-mainnet-op-reth-pruned
       - traefik.http.services.lisk-mainnet-op-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/lisk-mainnet`) || Path(`/lisk-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.lisk-mainnet-op-reth-pruned-trace.rule=Path(`/lisk-mainnet`) || Path(`/lisk-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.lisk-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/lisk-mainnet-op-reth-pruned`) || Path(`/lisk-mainnet-op-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.lisk-mainnet-op-reth-pruned-trace.rule=Path(`/lisk-mainnet-op-reth-pruned`) || Path(`/lisk-mainnet-op-reth-pruned/`)}
       - traefik.http.routers.lisk-mainnet-op-reth-pruned-trace.middlewares=lisk-mainnet-op-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  lisk-mainnet-node:
+  lisk-mainnet-op-reth-pruned-node:
     image: ${LISK_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${LISK_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 17812:17812
@@ -120,7 +120,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://lisk-mainnet:8551
+      - OP_NODE_L2_ENGINE_RPC=http://lisk-mainnet-op-reth-pruned:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -142,7 +142,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - lisk-mainnet
+      - lisk-mainnet-op-reth-pruned
     networks:
       - chains
     volumes:
diff --git a/op/reth/op-mainnet-op-reth-archive-trace.yml b/op/reth/op-mainnet-op-reth-archive-trace.yml
index 619457c0..79677308 100644
--- a/op/reth/op-mainnet-op-reth-archive-trace.yml
+++ b/op/reth/op-mainnet-op-reth-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/op-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/op-mainnet-op-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  op-mainnet-archive:
+  op-mainnet-op-reth:
     image: ${OP_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${OP_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.op-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/op-mainnet-archive
+      - traefik.http.middlewares.op-mainnet-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/op-mainnet-op-reth
       - traefik.http.services.op-mainnet-op-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/op-mainnet-archive`) || Path(`/op-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.op-mainnet-op-reth-archive-trace.rule=Path(`/op-mainnet-archive`) || Path(`/op-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/op-mainnet-op-reth`) || Path(`/op-mainnet-op-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.op-mainnet-op-reth-archive-trace.rule=Path(`/op-mainnet-op-reth`) || Path(`/op-mainnet-op-reth/`)}
       - traefik.http.routers.op-mainnet-op-reth-archive-trace.middlewares=op-mainnet-op-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  op-mainnet-archive-node:
+  op-mainnet-op-reth-node:
     image: ${OP_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${OP_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 16114:16114
@@ -118,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://op-mainnet-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://op-mainnet-op-reth:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - op-mainnet-archive
+      - op-mainnet-op-reth
     networks:
       - chains
     volumes:
diff --git a/op/reth/op-mainnet-op-reth-minimal-trace.yml b/op/reth/op-mainnet-op-reth-minimal-trace.yml
index ebf77049..c4ce438f 100644
--- a/op/reth/op-mainnet-op-reth-minimal-trace.yml
+++ b/op/reth/op-mainnet-op-reth-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/op-mainnet-minimal \
+# curl -X POST https://${IP}.traefik.me/op-mainnet-op-reth-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  op-mainnet-minimal:
+  op-mainnet-op-reth-minimal:
     image: ${OP_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${OP_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.op-mainnet-op-reth-minimal-trace-stripprefix.stripprefix.prefixes=/op-mainnet-minimal
+      - traefik.http.middlewares.op-mainnet-op-reth-minimal-trace-stripprefix.stripprefix.prefixes=/op-mainnet-op-reth-minimal
       - traefik.http.services.op-mainnet-op-reth-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/op-mainnet-minimal`) || Path(`/op-mainnet-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.op-mainnet-op-reth-minimal-trace.rule=Path(`/op-mainnet-minimal`) || Path(`/op-mainnet-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/op-mainnet-op-reth-minimal`) || Path(`/op-mainnet-op-reth-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.op-mainnet-op-reth-minimal-trace.rule=Path(`/op-mainnet-op-reth-minimal`) || Path(`/op-mainnet-op-reth-minimal/`)}
       - traefik.http.routers.op-mainnet-op-reth-minimal-trace.middlewares=op-mainnet-op-reth-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  op-mainnet-minimal-node:
+  op-mainnet-op-reth-minimal-node:
     image: ${OP_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${OP_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 16845:16845
@@ -118,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://op-mainnet-minimal:8551
+      - OP_NODE_L2_ENGINE_RPC=http://op-mainnet-op-reth-minimal:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - op-mainnet-minimal
+      - op-mainnet-op-reth-minimal
     networks:
       - chains
     volumes:
diff --git a/op/reth/op-mainnet-op-reth-pruned-trace.yml b/op/reth/op-mainnet-op-reth-pruned-trace.yml
index f76238ef..191c829a 100644
--- a/op/reth/op-mainnet-op-reth-pruned-trace.yml
+++ b/op/reth/op-mainnet-op-reth-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/op-mainnet \
+# curl -X POST https://${IP}.traefik.me/op-mainnet-op-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  op-mainnet:
+  op-mainnet-op-reth-pruned:
     image: ${OP_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${OP_MAINNET_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -98,16 +98,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.op-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/op-mainnet
+      - traefik.http.middlewares.op-mainnet-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/op-mainnet-op-reth-pruned
       - traefik.http.services.op-mainnet-op-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/op-mainnet`) || Path(`/op-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.op-mainnet-op-reth-pruned-trace.rule=Path(`/op-mainnet`) || Path(`/op-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.op-mainnet-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/op-mainnet-op-reth-pruned`) || Path(`/op-mainnet-op-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.op-mainnet-op-reth-pruned-trace.rule=Path(`/op-mainnet-op-reth-pruned`) || Path(`/op-mainnet-op-reth-pruned/`)}
       - traefik.http.routers.op-mainnet-op-reth-pruned-trace.middlewares=op-mainnet-op-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  op-mainnet-node:
+  op-mainnet-op-reth-pruned-node:
     image: ${OP_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${OP_MAINNET_NODE_VERSION:-v1.13.2}
     ports:
       - 18985:18985
@@ -119,7 +119,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_MAINNET_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_MAINNET_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://op-mainnet:8551
+      - OP_NODE_L2_ENGINE_RPC=http://op-mainnet-op-reth-pruned:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -140,7 +140,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - op-mainnet
+      - op-mainnet-op-reth-pruned
     networks:
       - chains
     volumes:
diff --git a/op/reth/op-sepolia-op-reth-archive-trace.yml b/op/reth/op-sepolia-op-reth-archive-trace.yml
index 2148a8e4..7312d418 100644
--- a/op/reth/op-sepolia-op-reth-archive-trace.yml
+++ b/op/reth/op-sepolia-op-reth-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/op-sepolia-archive \
+# curl -X POST https://${IP}.traefik.me/op-sepolia-op-reth \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  op-sepolia-archive:
+  op-sepolia-op-reth:
     image: ${OP_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${OP_SEPOLIA_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.op-sepolia-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/op-sepolia-archive
+      - traefik.http.middlewares.op-sepolia-op-reth-archive-trace-stripprefix.stripprefix.prefixes=/op-sepolia-op-reth
       - traefik.http.services.op-sepolia-op-reth-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/op-sepolia-archive`) || Path(`/op-sepolia-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.op-sepolia-op-reth-archive-trace.rule=Path(`/op-sepolia-archive`) || Path(`/op-sepolia-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/op-sepolia-op-reth`) || Path(`/op-sepolia-op-reth/`))}
+      - ${NO_SSL:+traefik.http.routers.op-sepolia-op-reth-archive-trace.rule=Path(`/op-sepolia-op-reth`) || Path(`/op-sepolia-op-reth/`)}
       - traefik.http.routers.op-sepolia-op-reth-archive-trace.middlewares=op-sepolia-op-reth-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  op-sepolia-archive-node:
+  op-sepolia-op-reth-node:
     image: ${OP_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${OP_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 17326:17326
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://op-sepolia-archive:8551
+      - OP_NODE_L2_ENGINE_RPC=http://op-sepolia-op-reth:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - op-sepolia-archive
+      - op-sepolia-op-reth
     networks:
       - chains
     volumes:
diff --git a/op/reth/op-sepolia-op-reth-minimal-trace.yml b/op/reth/op-sepolia-op-reth-minimal-trace.yml
index fce07f35..83d3a400 100644
--- a/op/reth/op-sepolia-op-reth-minimal-trace.yml
+++ b/op/reth/op-sepolia-op-reth-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/op-sepolia-minimal \
+# curl -X POST https://${IP}.traefik.me/op-sepolia-op-reth-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  op-sepolia-minimal:
+  op-sepolia-op-reth-minimal:
     image: ${OP_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${OP_SEPOLIA_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -96,16 +96,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.op-sepolia-op-reth-minimal-trace-stripprefix.stripprefix.prefixes=/op-sepolia-minimal
+      - traefik.http.middlewares.op-sepolia-op-reth-minimal-trace-stripprefix.stripprefix.prefixes=/op-sepolia-op-reth-minimal
       - traefik.http.services.op-sepolia-op-reth-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/op-sepolia-minimal`) || Path(`/op-sepolia-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.op-sepolia-op-reth-minimal-trace.rule=Path(`/op-sepolia-minimal`) || Path(`/op-sepolia-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/op-sepolia-op-reth-minimal`) || Path(`/op-sepolia-op-reth-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.op-sepolia-op-reth-minimal-trace.rule=Path(`/op-sepolia-op-reth-minimal`) || Path(`/op-sepolia-op-reth-minimal/`)}
       - traefik.http.routers.op-sepolia-op-reth-minimal-trace.middlewares=op-sepolia-op-reth-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  op-sepolia-minimal-node:
+  op-sepolia-op-reth-minimal-node:
     image: ${OP_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${OP_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 19859:19859
@@ -117,7 +117,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://op-sepolia-minimal:8551
+      - OP_NODE_L2_ENGINE_RPC=http://op-sepolia-op-reth-minimal:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -139,7 +139,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - op-sepolia-minimal
+      - op-sepolia-op-reth-minimal
     networks:
       - chains
     volumes:
diff --git a/op/reth/op-sepolia-op-reth-pruned-trace.yml b/op/reth/op-sepolia-op-reth-pruned-trace.yml
index 881fe440..ee0a8319 100644
--- a/op/reth/op-sepolia-op-reth-pruned-trace.yml
+++ b/op/reth/op-sepolia-op-reth-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/op-sepolia \
+# curl -X POST https://${IP}.traefik.me/op-sepolia-op-reth-pruned \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  op-sepolia:
+  op-sepolia-op-reth-pruned:
     image: ${OP_RETH_IMAGE:-ghcr.io/paradigmxyz/op-reth}:${OP_SEPOLIA_RETH_VERSION:-v1.4.1}
     sysctls:
       # TCP Performance
@@ -97,16 +97,16 @@ services:
       - prometheus-scrape.port=9001
       - prometheus-scrape.path=/metrics
       - traefik.enable=true
-      - traefik.http.middlewares.op-sepolia-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/op-sepolia
+      - traefik.http.middlewares.op-sepolia-op-reth-pruned-trace-stripprefix.stripprefix.prefixes=/op-sepolia-op-reth-pruned
       - traefik.http.services.op-sepolia-op-reth-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/op-sepolia`) || Path(`/op-sepolia/`))}
-      - ${NO_SSL:+traefik.http.routers.op-sepolia-op-reth-pruned-trace.rule=Path(`/op-sepolia`) || Path(`/op-sepolia/`)}
+      - ${NO_SSL:-traefik.http.routers.op-sepolia-op-reth-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/op-sepolia-op-reth-pruned`) || Path(`/op-sepolia-op-reth-pruned/`))}
+      - ${NO_SSL:+traefik.http.routers.op-sepolia-op-reth-pruned-trace.rule=Path(`/op-sepolia-op-reth-pruned`) || Path(`/op-sepolia-op-reth-pruned/`)}
       - traefik.http.routers.op-sepolia-op-reth-pruned-trace.middlewares=op-sepolia-op-reth-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
-  op-sepolia-node:
+  op-sepolia-op-reth-pruned-node:
     image: ${OP_NODE_IMAGE:-us-docker.pkg.dev/oplabs-tools-artifacts/images/op-node}:${OP_SEPOLIA_NODE_VERSION:-v1.13.2}
     ports:
       - 19442:19442
@@ -118,7 +118,7 @@ services:
       - OP_NODE_L1_RPC_KIND=${ETHEREUM_SEPOLIA_EXECUTION_KIND:-basic}
       - OP_NODE_L1_TRUST_RPC=${ETHEREUM_SEPOLIA_EXECUTION_TRUST:-false}
       - OP_NODE_L2_ENGINE_AUTH=/jwtsecret
-      - OP_NODE_L2_ENGINE_RPC=http://op-sepolia:8551
+      - OP_NODE_L2_ENGINE_RPC=http://op-sepolia-op-reth-pruned:8551
       - OP_NODE_L2_SKIP_SYNC_START_CHECK=true
       - OP_NODE_LOG_LEVEL=info
       - OP_NODE_METRICS_ADDR=0.0.0.0
@@ -140,7 +140,7 @@ services:
     entrypoint: [op-node]
     restart: unless-stopped
     depends_on:
-      - op-sepolia
+      - op-sepolia-op-reth-pruned
     networks:
       - chains
     volumes:
diff --git a/polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml b/polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml
index 89c86e41..ac4b30a2 100644
--- a/polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml
+++ b/polygon/erigon3/polygon-amoy-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/polygon-amoy-archive \
+# curl -X POST https://${IP}.traefik.me/polygon-amoy-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  polygon-amoy-archive:
+  polygon-amoy-erigon3-archive:
     image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_AMOY_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -92,12 +92,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.polygon-amoy-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/polygon-amoy-archive
+      - traefik.http.middlewares.polygon-amoy-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/polygon-amoy-erigon3-archive
       - traefik.http.services.polygon-amoy-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-amoy-archive`) || Path(`/polygon-amoy-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.polygon-amoy-erigon3-archive-trace.rule=Path(`/polygon-amoy-archive`) || Path(`/polygon-amoy-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-amoy-erigon3-archive`) || Path(`/polygon-amoy-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.polygon-amoy-erigon3-archive-trace.rule=Path(`/polygon-amoy-erigon3-archive`) || Path(`/polygon-amoy-erigon3-archive/`)}
       - traefik.http.routers.polygon-amoy-erigon3-archive-trace.middlewares=polygon-amoy-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml b/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml
index f47b9b06..1b4c650e 100644
--- a/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml
+++ b/polygon/erigon3/polygon-amoy-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/polygon-amoy-minimal \
+# curl -X POST https://${IP}.traefik.me/polygon-amoy-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  polygon-amoy-minimal:
+  polygon-amoy-erigon3-minimal:
     image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_AMOY_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -92,12 +92,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.polygon-amoy-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/polygon-amoy-minimal
+      - traefik.http.middlewares.polygon-amoy-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/polygon-amoy-erigon3-minimal
       - traefik.http.services.polygon-amoy-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-amoy-minimal`) || Path(`/polygon-amoy-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.polygon-amoy-erigon3-minimal-trace.rule=Path(`/polygon-amoy-minimal`) || Path(`/polygon-amoy-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-amoy-erigon3-minimal`) || Path(`/polygon-amoy-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.polygon-amoy-erigon3-minimal-trace.rule=Path(`/polygon-amoy-erigon3-minimal`) || Path(`/polygon-amoy-erigon3-minimal/`)}
       - traefik.http.routers.polygon-amoy-erigon3-minimal-trace.middlewares=polygon-amoy-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml b/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml
index fa731320..c90e43e7 100644
--- a/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml
+++ b/polygon/erigon3/polygon-amoy-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/polygon-amoy \
+# curl -X POST https://${IP}.traefik.me/polygon-amoy-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  polygon-amoy:
+  polygon-amoy-erigon3:
     image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_AMOY_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -92,12 +92,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.polygon-amoy-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/polygon-amoy
+      - traefik.http.middlewares.polygon-amoy-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/polygon-amoy-erigon3
       - traefik.http.services.polygon-amoy-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-amoy`) || Path(`/polygon-amoy/`))}
-      - ${NO_SSL:+traefik.http.routers.polygon-amoy-erigon3-pruned-trace.rule=Path(`/polygon-amoy`) || Path(`/polygon-amoy/`)}
+      - ${NO_SSL:-traefik.http.routers.polygon-amoy-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-amoy-erigon3`) || Path(`/polygon-amoy-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.polygon-amoy-erigon3-pruned-trace.rule=Path(`/polygon-amoy-erigon3`) || Path(`/polygon-amoy-erigon3/`)}
       - traefik.http.routers.polygon-amoy-erigon3-pruned-trace.middlewares=polygon-amoy-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/polygon/erigon3/polygon-mainnet-erigon3-archive-trace.yml b/polygon/erigon3/polygon-mainnet-erigon3-archive-trace.yml
index 6c1aa7d6..f14e9847 100644
--- a/polygon/erigon3/polygon-mainnet-erigon3-archive-trace.yml
+++ b/polygon/erigon3/polygon-mainnet-erigon3-archive-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/polygon-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/polygon-mainnet-erigon3-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  polygon-mainnet-archive:
+  polygon-mainnet-erigon3-archive:
     image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -92,12 +92,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.polygon-mainnet-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/polygon-mainnet-archive
+      - traefik.http.middlewares.polygon-mainnet-erigon3-archive-trace-stripprefix.stripprefix.prefixes=/polygon-mainnet-erigon3-archive
       - traefik.http.services.polygon-mainnet-erigon3-archive-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-archive-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-archive-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-mainnet-archive`) || Path(`/polygon-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.polygon-mainnet-erigon3-archive-trace.rule=Path(`/polygon-mainnet-archive`) || Path(`/polygon-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-archive-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-mainnet-erigon3-archive`) || Path(`/polygon-mainnet-erigon3-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.polygon-mainnet-erigon3-archive-trace.rule=Path(`/polygon-mainnet-erigon3-archive`) || Path(`/polygon-mainnet-erigon3-archive/`)}
       - traefik.http.routers.polygon-mainnet-erigon3-archive-trace.middlewares=polygon-mainnet-erigon3-archive-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/polygon/erigon3/polygon-mainnet-erigon3-minimal-trace.yml b/polygon/erigon3/polygon-mainnet-erigon3-minimal-trace.yml
index 890e5035..5dc92207 100644
--- a/polygon/erigon3/polygon-mainnet-erigon3-minimal-trace.yml
+++ b/polygon/erigon3/polygon-mainnet-erigon3-minimal-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/polygon-mainnet-minimal \
+# curl -X POST https://${IP}.traefik.me/polygon-mainnet-erigon3-minimal \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  polygon-mainnet-minimal:
+  polygon-mainnet-erigon3-minimal:
     image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -92,12 +92,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.polygon-mainnet-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/polygon-mainnet-minimal
+      - traefik.http.middlewares.polygon-mainnet-erigon3-minimal-trace-stripprefix.stripprefix.prefixes=/polygon-mainnet-erigon3-minimal
       - traefik.http.services.polygon-mainnet-erigon3-minimal-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-minimal-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-minimal-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-mainnet-minimal`) || Path(`/polygon-mainnet-minimal/`))}
-      - ${NO_SSL:+traefik.http.routers.polygon-mainnet-erigon3-minimal-trace.rule=Path(`/polygon-mainnet-minimal`) || Path(`/polygon-mainnet-minimal/`)}
+      - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-minimal-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-mainnet-erigon3-minimal`) || Path(`/polygon-mainnet-erigon3-minimal/`))}
+      - ${NO_SSL:+traefik.http.routers.polygon-mainnet-erigon3-minimal-trace.rule=Path(`/polygon-mainnet-erigon3-minimal`) || Path(`/polygon-mainnet-erigon3-minimal/`)}
       - traefik.http.routers.polygon-mainnet-erigon3-minimal-trace.middlewares=polygon-mainnet-erigon3-minimal-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/polygon/erigon3/polygon-mainnet-erigon3-pruned-trace.yml b/polygon/erigon3/polygon-mainnet-erigon3-pruned-trace.yml
index f0aba2d0..f17f6bd3 100644
--- a/polygon/erigon3/polygon-mainnet-erigon3-pruned-trace.yml
+++ b/polygon/erigon3/polygon-mainnet-erigon3-pruned-trace.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/polygon-mainnet \
+# curl -X POST https://${IP}.traefik.me/polygon-mainnet-erigon3 \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  polygon-mainnet:
+  polygon-mainnet-erigon3:
     image: ${POLYGON_ERIGON3_IMAGE:-erigontech/erigon}:${POLYGON_MAINNET_ERIGON3_VERSION:-v3.0.3}
     sysctls:
       # TCP Performance
@@ -92,12 +92,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.polygon-mainnet-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/polygon-mainnet
+      - traefik.http.middlewares.polygon-mainnet-erigon3-pruned-trace-stripprefix.stripprefix.prefixes=/polygon-mainnet-erigon3
       - traefik.http.services.polygon-mainnet-erigon3-pruned-trace.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-pruned-trace.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-pruned-trace.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-mainnet`) || Path(`/polygon-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.polygon-mainnet-erigon3-pruned-trace.rule=Path(`/polygon-mainnet`) || Path(`/polygon-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.polygon-mainnet-erigon3-pruned-trace.rule=Host(`$DOMAIN`) && (Path(`/polygon-mainnet-erigon3`) || Path(`/polygon-mainnet-erigon3/`))}
+      - ${NO_SSL:+traefik.http.routers.polygon-mainnet-erigon3-pruned-trace.rule=Path(`/polygon-mainnet-erigon3`) || Path(`/polygon-mainnet-erigon3/`)}
       - traefik.http.routers.polygon-mainnet-erigon3-pruned-trace.middlewares=polygon-mainnet-erigon3-pruned-trace-stripprefix, ipallowlist
     shm_size: 2gb
 
diff --git a/rootstock/rskj/rootstock-bamboo-rskj-archive.yml b/rootstock/rskj/rootstock-bamboo-rskj-archive.yml
index 06bfd8d8..bff6db6b 100644
--- a/rootstock/rskj/rootstock-bamboo-rskj-archive.yml
+++ b/rootstock/rskj/rootstock-bamboo-rskj-archive.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/rootstock-bamboo-archive \
+# curl -X POST https://${IP}.traefik.me/rootstock-bamboo \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  rootstock-bamboo-archive-client:
+  rootstock-bamboo-client:
     image: ${ROOTSTOCK_RSKJ_IMAGE:-rsksmart/rskj}:${ROOTSTOCK_BAMBOO_RSKJ_VERSION:-LOVELL-7.0.0}
     sysctls:
       # TCP Performance
@@ -64,19 +64,19 @@ services:
     labels:
       - prometheus-scrape.enabled=false
 
-  rootstock-bamboo-archive:
+  rootstock-bamboo:
     image: nginx
     expose:
       - '80'
     environment:
-      PROXY_HOST: rootstock-bamboo-archive-client
+      PROXY_HOST: rootstock-bamboo-client
       RPC_PATH: /
       RPC_PORT: 8545
       WS_PATH: /
       WS_PORT: 8546
     restart: unless-stopped
     depends_on:
-      - rootstock-bamboo-archive-client
+      - rootstock-bamboo-client
     networks:
       - chains
     volumes:
@@ -85,12 +85,12 @@ services:
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.rootstock-bamboo-rskj-archive-stripprefix.stripprefix.prefixes=/rootstock-bamboo-archive
+      - traefik.http.middlewares.rootstock-bamboo-rskj-archive-stripprefix.stripprefix.prefixes=/rootstock-bamboo
       - traefik.http.services.rootstock-bamboo-rskj-archive.loadbalancer.server.port=80
       - ${NO_SSL:-traefik.http.routers.rootstock-bamboo-rskj-archive.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.rootstock-bamboo-rskj-archive.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.rootstock-bamboo-rskj-archive.rule=Host(`$DOMAIN`) && (Path(`/rootstock-bamboo-archive`) || Path(`/rootstock-bamboo-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.rootstock-bamboo-rskj-archive.rule=Path(`/rootstock-bamboo-archive`) || Path(`/rootstock-bamboo-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.rootstock-bamboo-rskj-archive.rule=Host(`$DOMAIN`) && (Path(`/rootstock-bamboo`) || Path(`/rootstock-bamboo/`))}
+      - ${NO_SSL:+traefik.http.routers.rootstock-bamboo-rskj-archive.rule=Path(`/rootstock-bamboo`) || Path(`/rootstock-bamboo/`)}
       - traefik.http.routers.rootstock-bamboo-rskj-archive.middlewares=rootstock-bamboo-rskj-archive-stripprefix, ipallowlist
 
 volumes:
diff --git a/rootstock/rskj/rootstock-mainnet-rskj-archive.yml b/rootstock/rskj/rootstock-mainnet-rskj-archive.yml
index 84f9d175..d52a9661 100644
--- a/rootstock/rskj/rootstock-mainnet-rskj-archive.yml
+++ b/rootstock/rskj/rootstock-mainnet-rskj-archive.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/rootstock-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/rootstock-mainnet \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  rootstock-mainnet-archive-client:
+  rootstock-mainnet-client:
     image: ${ROOTSTOCK_RSKJ_IMAGE:-rsksmart/rskj}:${ROOTSTOCK_MAINNET_RSKJ_VERSION:-ARROWHEAD-6.1.0}
     sysctls:
       # TCP Performance
@@ -64,19 +64,19 @@ services:
     labels:
       - prometheus-scrape.enabled=false
 
-  rootstock-mainnet-archive:
+  rootstock-mainnet:
     image: nginx
     expose:
       - '80'
     environment:
-      PROXY_HOST: rootstock-mainnet-archive-client
+      PROXY_HOST: rootstock-mainnet-client
       RPC_PATH: /
       RPC_PORT: 8545
       WS_PATH: /
       WS_PORT: 8546
     restart: unless-stopped
     depends_on:
-      - rootstock-mainnet-archive-client
+      - rootstock-mainnet-client
     networks:
       - chains
     volumes:
@@ -85,12 +85,12 @@ services:
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.rootstock-mainnet-rskj-archive-stripprefix.stripprefix.prefixes=/rootstock-mainnet-archive
+      - traefik.http.middlewares.rootstock-mainnet-rskj-archive-stripprefix.stripprefix.prefixes=/rootstock-mainnet
       - traefik.http.services.rootstock-mainnet-rskj-archive.loadbalancer.server.port=80
       - ${NO_SSL:-traefik.http.routers.rootstock-mainnet-rskj-archive.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.rootstock-mainnet-rskj-archive.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.rootstock-mainnet-rskj-archive.rule=Host(`$DOMAIN`) && (Path(`/rootstock-mainnet-archive`) || Path(`/rootstock-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.rootstock-mainnet-rskj-archive.rule=Path(`/rootstock-mainnet-archive`) || Path(`/rootstock-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.rootstock-mainnet-rskj-archive.rule=Host(`$DOMAIN`) && (Path(`/rootstock-mainnet`) || Path(`/rootstock-mainnet/`))}
+      - ${NO_SSL:+traefik.http.routers.rootstock-mainnet-rskj-archive.rule=Path(`/rootstock-mainnet`) || Path(`/rootstock-mainnet/`)}
       - traefik.http.routers.rootstock-mainnet-rskj-archive.middlewares=rootstock-mainnet-rskj-archive-stripprefix, ipallowlist
 
 volumes:
diff --git a/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml b/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
index 428ce3ab..702f66dc 100644
--- a/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
+++ b/solana/agave/solana-mainnet-agave-pruned-rocksdb--firesol.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/solana-mainnet \
+# curl -X POST https://${IP}.traefik.me/solana-mainnet-agave \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  solana-mainnet-client:
+  solana-mainnet-agave-client:
     image: ${SOLANA_FIRESOL_IMAGE:-ghcr.io/streamingfast/firehose-solana}:${SOLANA_MAINNET_FIRESOL_VERSION:-v1.1.3}
     sysctls:
       # TCP Performance
@@ -92,19 +92,19 @@ services:
       - prometheus-scrape.port=12344
       - prometheus-scrape.path=/metrics
 
-  solana-mainnet:
+  solana-mainnet-agave:
     image: nginx
     expose:
       - '80'
     environment:
-      PROXY_HOST: solana-mainnet-client
+      PROXY_HOST: solana-mainnet-agave-client
       RPC_PATH: ''
       RPC_PORT: 8899
       WS_PATH: ''
       WS_PORT: 8899
     restart: unless-stopped
     depends_on:
-      - solana-mainnet-client
+      - solana-mainnet-agave-client
     networks:
       - chains
     volumes:
@@ -113,15 +113,15 @@ services:
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.solana-mainnet-agave-pruned-rocksdb-stripprefix.stripprefix.prefixes=/solana-mainnet
+      - traefik.http.middlewares.solana-mainnet-agave-pruned-rocksdb-stripprefix.stripprefix.prefixes=/solana-mainnet-agave
       - traefik.http.services.solana-mainnet-agave-pruned-rocksdb.loadbalancer.server.port=80
       - ${NO_SSL:-traefik.http.routers.solana-mainnet-agave-pruned-rocksdb.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.solana-mainnet-agave-pruned-rocksdb.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.solana-mainnet-agave-pruned-rocksdb.rule=Host(`$DOMAIN`) && (Path(`/solana-mainnet`) || Path(`/solana-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.solana-mainnet-agave-pruned-rocksdb.rule=Path(`/solana-mainnet`) || Path(`/solana-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.solana-mainnet-agave-pruned-rocksdb.rule=Host(`$DOMAIN`) && (Path(`/solana-mainnet-agave`) || Path(`/solana-mainnet-agave/`))}
+      - ${NO_SSL:+traefik.http.routers.solana-mainnet-agave-pruned-rocksdb.rule=Path(`/solana-mainnet-agave`) || Path(`/solana-mainnet-agave/`)}
       - traefik.http.routers.solana-mainnet-agave-pruned-rocksdb.middlewares=solana-mainnet-agave-pruned-rocksdb-stripprefix, ipallowlist
 
-  solana-mainnet-firehose:
+  solana-mainnet-agave-firehose:
     image: ${SOLANA_FIRESOL_IMAGE:-ghcr.io/streamingfast/firehose-solana}:${SOLANA_MAINNET_FIRESOL_VERSION:-v1.1.3}
     expose:
       - 10015
@@ -131,10 +131,10 @@ services:
     entrypoint: [sh, -c, exec firesol start firehose index-builder relayer merger $@, _]
     command:
       - --log-to-file=false
-      - --relayer-source=http://solana-mainnet-client:10010
+      - --relayer-source=http://solana-mainnet-agave-client:10010
     restart: unless-stopped
     depends_on:
-      - solana-mainnet
+      - solana-mainnet-agave
     networks:
       - chains
     volumes:
@@ -148,21 +148,21 @@ services:
       - traefik.http.services.solana-mainnet-agave-pruned-rocksdb-firehose.loadbalancer.server.port=10015
       - traefik.http.routers.solana-mainnet-agave-pruned-rocksdb-firehose.entrypoints=grpc
       - ${NO_SSL:-traefik.http.routers.solana-mainnet-agave-pruned-rocksdb-firehose.tls.certresolver=myresolver}
-      - traefik.http.routers.solana-mainnet-agave-pruned-rocksdb-firehose.rule=Host(`solana-mainnet-firehose.${DOMAIN}`)
+      - traefik.http.routers.solana-mainnet-agave-pruned-rocksdb-firehose.rule=Host(`solana-mainnet-agave-firehose.${DOMAIN}`)
       - traefik.http.routers.solana-mainnet-agave-pruned-rocksdb-firehose.middlewares=ipallowlist
 
-  solana-mainnet-events:
+  solana-mainnet-agave-events:
     image: ${SOLANA_FIRESOL_IMAGE:-anzaxyz/agave}:${SOLANA_MAINNET_FIRESOL_VERSION:-v2.2.14}
     expose:
       - 10016
     entrypoint: [sh, -c, exec firesol start substreams-tier-1 substreams-tier-2 $@, _]
     command:
-      - --common-live-blocks-addr=http://solana-mainnet-firehose:10014
+      - --common-live-blocks-addr=http://solana-mainnet-agave-firehose:10014
       - --log-to-file=false
       - --substreams-rpc-endpoints=${SOLANA_MAINNET_FIRESOL_ARCHIVE_RPC}
     restart: unless-stopped
     depends_on:
-      - solana-mainnet
+      - solana-mainnet-agave
     networks:
       - chains
     volumes:
@@ -175,7 +175,7 @@ services:
       - traefik.http.services.solana-mainnet-agave-pruned-rocksdb-events.loadbalancer.server.port=10016
       - traefik.http.routers.solana-mainnet-agave-pruned-rocksdb-events.entrypoints=grpc
       - ${NO_SSL:-traefik.http.routers.solana-mainnet-agave-pruned-rocksdb-events.tls.certresolver=myresolver}
-      - traefik.http.routers.solana-mainnet-agave-pruned-rocksdb-events.rule=Host(`solana-mainnet-events.${DOMAIN}`)
+      - traefik.http.routers.solana-mainnet-agave-pruned-rocksdb-events.rule=Host(`solana-mainnet-agave-events.${DOMAIN}`)
       - traefik.http.routers.solana-mainnet-agave-pruned-rocksdb-events.middlewares=ipallowlist
 
 volumes:
diff --git a/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml b/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
index 2b171402..6121aaab 100644
--- a/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
+++ b/solana/agave/solana-testnet-agave-pruned-rocksdb--firesol.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/solana-testnet \
+# curl -X POST https://${IP}.traefik.me/solana-testnet-agave \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  solana-testnet-client:
+  solana-testnet-agave-client:
     image: ${SOLANA_FIRESOL_IMAGE:-ghcr.io/streamingfast/firehose-solana}:${SOLANA_TESTNET_FIRESOL_VERSION:-v1.1.3}
     sysctls:
       # TCP Performance
@@ -90,19 +90,19 @@ services:
       - prometheus-scrape.port=12344
       - prometheus-scrape.path=/metrics
 
-  solana-testnet:
+  solana-testnet-agave:
     image: nginx
     expose:
       - '80'
     environment:
-      PROXY_HOST: solana-testnet-client
+      PROXY_HOST: solana-testnet-agave-client
       RPC_PATH: ''
       RPC_PORT: 8899
       WS_PATH: ''
       WS_PORT: 8899
     restart: unless-stopped
     depends_on:
-      - solana-testnet-client
+      - solana-testnet-agave-client
     networks:
       - chains
     volumes:
@@ -111,15 +111,15 @@ services:
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.solana-testnet-agave-pruned-rocksdb-stripprefix.stripprefix.prefixes=/solana-testnet
+      - traefik.http.middlewares.solana-testnet-agave-pruned-rocksdb-stripprefix.stripprefix.prefixes=/solana-testnet-agave
       - traefik.http.services.solana-testnet-agave-pruned-rocksdb.loadbalancer.server.port=80
       - ${NO_SSL:-traefik.http.routers.solana-testnet-agave-pruned-rocksdb.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.solana-testnet-agave-pruned-rocksdb.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.solana-testnet-agave-pruned-rocksdb.rule=Host(`$DOMAIN`) && (Path(`/solana-testnet`) || Path(`/solana-testnet/`))}
-      - ${NO_SSL:+traefik.http.routers.solana-testnet-agave-pruned-rocksdb.rule=Path(`/solana-testnet`) || Path(`/solana-testnet/`)}
+      - ${NO_SSL:-traefik.http.routers.solana-testnet-agave-pruned-rocksdb.rule=Host(`$DOMAIN`) && (Path(`/solana-testnet-agave`) || Path(`/solana-testnet-agave/`))}
+      - ${NO_SSL:+traefik.http.routers.solana-testnet-agave-pruned-rocksdb.rule=Path(`/solana-testnet-agave`) || Path(`/solana-testnet-agave/`)}
       - traefik.http.routers.solana-testnet-agave-pruned-rocksdb.middlewares=solana-testnet-agave-pruned-rocksdb-stripprefix, ipallowlist
 
-  solana-testnet-firehose:
+  solana-testnet-agave-firehose:
     image: ${SOLANA_FIRESOL_IMAGE:-ghcr.io/streamingfast/firehose-solana}:${SOLANA_TESTNET_FIRESOL_VERSION:-v1.1.3}
     expose:
       - 10015
@@ -129,10 +129,10 @@ services:
     entrypoint: [sh, -c, exec firesol start firehose index-builder relayer merger $@, _]
     command:
       - --log-to-file=false
-      - --relayer-source=http://solana-testnet-client:10010
+      - --relayer-source=http://solana-testnet-agave-client:10010
     restart: unless-stopped
     depends_on:
-      - solana-testnet
+      - solana-testnet-agave
     networks:
       - chains
     volumes:
@@ -146,21 +146,21 @@ services:
       - traefik.http.services.solana-testnet-agave-pruned-rocksdb-firehose.loadbalancer.server.port=10015
       - traefik.http.routers.solana-testnet-agave-pruned-rocksdb-firehose.entrypoints=grpc
       - ${NO_SSL:-traefik.http.routers.solana-testnet-agave-pruned-rocksdb-firehose.tls.certresolver=myresolver}
-      - traefik.http.routers.solana-testnet-agave-pruned-rocksdb-firehose.rule=Host(`solana-testnet-firehose.${DOMAIN}`)
+      - traefik.http.routers.solana-testnet-agave-pruned-rocksdb-firehose.rule=Host(`solana-testnet-agave-firehose.${DOMAIN}`)
       - traefik.http.routers.solana-testnet-agave-pruned-rocksdb-firehose.middlewares=ipallowlist
 
-  solana-testnet-events:
+  solana-testnet-agave-events:
     image: ${SOLANA_FIRESOL_IMAGE:-anzaxyz/agave}:${SOLANA_TESTNET_FIRESOL_VERSION:-v2.2.14}
     expose:
       - 10016
     entrypoint: [sh, -c, exec firesol start substreams-tier-1 substreams-tier-2 $@, _]
     command:
-      - --common-live-blocks-addr=http://solana-testnet-firehose:10014
+      - --common-live-blocks-addr=http://solana-testnet-agave-firehose:10014
       - --log-to-file=false
       - --substreams-rpc-endpoints=${SOLANA_TESTNET_FIRESOL_ARCHIVE_RPC}
     restart: unless-stopped
     depends_on:
-      - solana-testnet
+      - solana-testnet-agave
     networks:
       - chains
     volumes:
@@ -173,7 +173,7 @@ services:
       - traefik.http.services.solana-testnet-agave-pruned-rocksdb-events.loadbalancer.server.port=10016
       - traefik.http.routers.solana-testnet-agave-pruned-rocksdb-events.entrypoints=grpc
       - ${NO_SSL:-traefik.http.routers.solana-testnet-agave-pruned-rocksdb-events.tls.certresolver=myresolver}
-      - traefik.http.routers.solana-testnet-agave-pruned-rocksdb-events.rule=Host(`solana-testnet-events.${DOMAIN}`)
+      - traefik.http.routers.solana-testnet-agave-pruned-rocksdb-events.rule=Host(`solana-testnet-agave-events.${DOMAIN}`)
       - traefik.http.routers.solana-testnet-agave-pruned-rocksdb-events.middlewares=ipallowlist
 
 volumes:
diff --git a/sonic/sonic/sonic-mainnet-sonic-archive.yml b/sonic/sonic/sonic-mainnet-sonic-archive.yml
index 1a934264..dc21e40b 100644
--- a/sonic/sonic/sonic-mainnet-sonic-archive.yml
+++ b/sonic/sonic/sonic-mainnet-sonic-archive.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/sonic-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/sonic-mainnet \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  sonic-mainnet-archive:
+  sonic-mainnet:
     build:
       context: ./sonic
       dockerfile: sonic.Dockerfile
@@ -94,12 +94,12 @@ services:
       - prometheus-scrape.port=6060
       - prometheus-scrape.path=/debug/metrics/prometheus
       - traefik.enable=true
-      - traefik.http.middlewares.sonic-mainnet-sonic-archive-stripprefix.stripprefix.prefixes=/sonic-mainnet-archive
+      - traefik.http.middlewares.sonic-mainnet-sonic-archive-stripprefix.stripprefix.prefixes=/sonic-mainnet
       - traefik.http.services.sonic-mainnet-sonic-archive.loadbalancer.server.port=8545
       - ${NO_SSL:-traefik.http.routers.sonic-mainnet-sonic-archive.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.sonic-mainnet-sonic-archive.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.sonic-mainnet-sonic-archive.rule=Host(`$DOMAIN`) && (Path(`/sonic-mainnet-archive`) || Path(`/sonic-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.sonic-mainnet-sonic-archive.rule=Path(`/sonic-mainnet-archive`) || Path(`/sonic-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.sonic-mainnet-sonic-archive.rule=Host(`$DOMAIN`) && (Path(`/sonic-mainnet`) || Path(`/sonic-mainnet/`))}
+      - ${NO_SSL:+traefik.http.routers.sonic-mainnet-sonic-archive.rule=Path(`/sonic-mainnet`) || Path(`/sonic-mainnet/`)}
       - traefik.http.routers.sonic-mainnet-sonic-archive.middlewares=sonic-mainnet-sonic-archive-stripprefix, ipallowlist
 
 volumes:
diff --git a/viction/node/viction-mainnet-node-archive-leveldb-hash.yml b/viction/node/viction-mainnet-node-archive-leveldb-hash.yml
index 30ece08b..57558ac0 100644
--- a/viction/node/viction-mainnet-node-archive-leveldb-hash.yml
+++ b/viction/node/viction-mainnet-node-archive-leveldb-hash.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/viction-mainnet-archive \
+# curl -X POST https://${IP}.traefik.me/viction-mainnet-node-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  viction-mainnet-archive-client:
+  viction-mainnet-node-archive-client:
     image: ${VICTION_NODE_IMAGE:-buildonviction/node}:${VICTION_MAINNET_NODE_VERSION:-v2.4.6}
     sysctls:
       # TCP Performance
@@ -72,19 +72,19 @@ services:
     labels:
       - prometheus-scrape.enabled=false
 
-  viction-mainnet-archive:
+  viction-mainnet-node-archive:
     image: nginx
     expose:
       - '80'
     environment:
-      PROXY_HOST: viction-mainnet-archive-client
+      PROXY_HOST: viction-mainnet-node-archive-client
       RPC_PATH: ''
       RPC_PORT: 8545
       WS_PATH: ''
       WS_PORT: 8546
     restart: unless-stopped
     depends_on:
-      - viction-mainnet-archive-client
+      - viction-mainnet-node-archive-client
     networks:
       - chains
     volumes:
@@ -93,12 +93,12 @@ services:
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.viction-mainnet-node-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/viction-mainnet-archive
+      - traefik.http.middlewares.viction-mainnet-node-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/viction-mainnet-node-archive
       - traefik.http.services.viction-mainnet-node-archive-leveldb-hash.loadbalancer.server.port=80
       - ${NO_SSL:-traefik.http.routers.viction-mainnet-node-archive-leveldb-hash.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.viction-mainnet-node-archive-leveldb-hash.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.viction-mainnet-node-archive-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/viction-mainnet-archive`) || Path(`/viction-mainnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.viction-mainnet-node-archive-leveldb-hash.rule=Path(`/viction-mainnet-archive`) || Path(`/viction-mainnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.viction-mainnet-node-archive-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/viction-mainnet-node-archive`) || Path(`/viction-mainnet-node-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.viction-mainnet-node-archive-leveldb-hash.rule=Path(`/viction-mainnet-node-archive`) || Path(`/viction-mainnet-node-archive/`)}
       - traefik.http.routers.viction-mainnet-node-archive-leveldb-hash.middlewares=viction-mainnet-node-archive-leveldb-hash-stripprefix, ipallowlist
 
 volumes:
diff --git a/viction/node/viction-mainnet-node-pruned-leveldb-hash.yml b/viction/node/viction-mainnet-node-pruned-leveldb-hash.yml
index ca4dcf73..46828c05 100644
--- a/viction/node/viction-mainnet-node-pruned-leveldb-hash.yml
+++ b/viction/node/viction-mainnet-node-pruned-leveldb-hash.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/viction-mainnet \
+# curl -X POST https://${IP}.traefik.me/viction-mainnet-node \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  viction-mainnet-client:
+  viction-mainnet-node-client:
     image: ${VICTION_NODE_IMAGE:-buildonviction/node}:${VICTION_MAINNET_NODE_VERSION:-v2.4.6}
     sysctls:
       # TCP Performance
@@ -72,19 +72,19 @@ services:
     labels:
       - prometheus-scrape.enabled=false
 
-  viction-mainnet:
+  viction-mainnet-node:
     image: nginx
     expose:
       - '80'
     environment:
-      PROXY_HOST: viction-mainnet-client
+      PROXY_HOST: viction-mainnet-node-client
       RPC_PATH: ''
       RPC_PORT: 8545
       WS_PATH: ''
       WS_PORT: 8546
     restart: unless-stopped
     depends_on:
-      - viction-mainnet-client
+      - viction-mainnet-node-client
     networks:
       - chains
     volumes:
@@ -93,12 +93,12 @@ services:
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.viction-mainnet-node-pruned-leveldb-hash-stripprefix.stripprefix.prefixes=/viction-mainnet
+      - traefik.http.middlewares.viction-mainnet-node-pruned-leveldb-hash-stripprefix.stripprefix.prefixes=/viction-mainnet-node
       - traefik.http.services.viction-mainnet-node-pruned-leveldb-hash.loadbalancer.server.port=80
       - ${NO_SSL:-traefik.http.routers.viction-mainnet-node-pruned-leveldb-hash.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.viction-mainnet-node-pruned-leveldb-hash.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.viction-mainnet-node-pruned-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/viction-mainnet`) || Path(`/viction-mainnet/`))}
-      - ${NO_SSL:+traefik.http.routers.viction-mainnet-node-pruned-leveldb-hash.rule=Path(`/viction-mainnet`) || Path(`/viction-mainnet/`)}
+      - ${NO_SSL:-traefik.http.routers.viction-mainnet-node-pruned-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/viction-mainnet-node`) || Path(`/viction-mainnet-node/`))}
+      - ${NO_SSL:+traefik.http.routers.viction-mainnet-node-pruned-leveldb-hash.rule=Path(`/viction-mainnet-node`) || Path(`/viction-mainnet-node/`)}
       - traefik.http.routers.viction-mainnet-node-pruned-leveldb-hash.middlewares=viction-mainnet-node-pruned-leveldb-hash-stripprefix, ipallowlist
 
 volumes:
diff --git a/viction/node/viction-testnet-node-archive-leveldb-hash.yml b/viction/node/viction-testnet-node-archive-leveldb-hash.yml
index 73d3e823..fa70e7d0 100644
--- a/viction/node/viction-testnet-node-archive-leveldb-hash.yml
+++ b/viction/node/viction-testnet-node-archive-leveldb-hash.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/viction-testnet-archive \
+# curl -X POST https://${IP}.traefik.me/viction-testnet-node-archive \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  viction-testnet-archive-client:
+  viction-testnet-node-archive-client:
     image: ${VICTION_NODE_IMAGE:-buildonviction/node}:${VICTION_TESTNET_NODE_VERSION:-v2.4.6}
     sysctls:
       # TCP Performance
@@ -72,19 +72,19 @@ services:
     labels:
       - prometheus-scrape.enabled=false
 
-  viction-testnet-archive:
+  viction-testnet-node-archive:
     image: nginx
     expose:
       - '80'
     environment:
-      PROXY_HOST: viction-testnet-archive-client
+      PROXY_HOST: viction-testnet-node-archive-client
       RPC_PATH: ''
       RPC_PORT: 8545
       WS_PATH: ''
       WS_PORT: 8546
     restart: unless-stopped
     depends_on:
-      - viction-testnet-archive-client
+      - viction-testnet-node-archive-client
     networks:
       - chains
     volumes:
@@ -93,12 +93,12 @@ services:
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.viction-testnet-node-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/viction-testnet-archive
+      - traefik.http.middlewares.viction-testnet-node-archive-leveldb-hash-stripprefix.stripprefix.prefixes=/viction-testnet-node-archive
       - traefik.http.services.viction-testnet-node-archive-leveldb-hash.loadbalancer.server.port=80
       - ${NO_SSL:-traefik.http.routers.viction-testnet-node-archive-leveldb-hash.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.viction-testnet-node-archive-leveldb-hash.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.viction-testnet-node-archive-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/viction-testnet-archive`) || Path(`/viction-testnet-archive/`))}
-      - ${NO_SSL:+traefik.http.routers.viction-testnet-node-archive-leveldb-hash.rule=Path(`/viction-testnet-archive`) || Path(`/viction-testnet-archive/`)}
+      - ${NO_SSL:-traefik.http.routers.viction-testnet-node-archive-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/viction-testnet-node-archive`) || Path(`/viction-testnet-node-archive/`))}
+      - ${NO_SSL:+traefik.http.routers.viction-testnet-node-archive-leveldb-hash.rule=Path(`/viction-testnet-node-archive`) || Path(`/viction-testnet-node-archive/`)}
       - traefik.http.routers.viction-testnet-node-archive-leveldb-hash.middlewares=viction-testnet-node-archive-leveldb-hash-stripprefix, ipallowlist
 
 volumes:
diff --git a/viction/node/viction-testnet-node-pruned-leveldb-hash.yml b/viction/node/viction-testnet-node-pruned-leveldb-hash.yml
index ab8d1fef..50ffb6a3 100644
--- a/viction/node/viction-testnet-node-pruned-leveldb-hash.yml
+++ b/viction/node/viction-testnet-node-pruned-leveldb-hash.yml
@@ -19,7 +19,7 @@
 #
 # docker compose up -d
 #
-# curl -X POST https://${IP}.traefik.me/viction-testnet \
+# curl -X POST https://${IP}.traefik.me/viction-testnet-node \
 #   -H "Content-Type: application/json" \
 #   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
 x-logging-defaults: &logging-defaults
@@ -29,7 +29,7 @@ x-logging-defaults: &logging-defaults
     max-file: '3'
 
 services:
-  viction-testnet-client:
+  viction-testnet-node-client:
     image: ${VICTION_NODE_IMAGE:-buildonviction/node}:${VICTION_TESTNET_NODE_VERSION:-v2.4.6}
     sysctls:
       # TCP Performance
@@ -72,19 +72,19 @@ services:
     labels:
       - prometheus-scrape.enabled=false
 
-  viction-testnet:
+  viction-testnet-node:
     image: nginx
     expose:
       - '80'
     environment:
-      PROXY_HOST: viction-testnet-client
+      PROXY_HOST: viction-testnet-node-client
       RPC_PATH: ''
       RPC_PORT: 8545
       WS_PATH: ''
       WS_PORT: 8546
     restart: unless-stopped
     depends_on:
-      - viction-testnet-client
+      - viction-testnet-node-client
     networks:
       - chains
     volumes:
@@ -93,12 +93,12 @@ services:
     labels:
       - prometheus-scrape.enabled=false
       - traefik.enable=true
-      - traefik.http.middlewares.viction-testnet-node-pruned-leveldb-hash-stripprefix.stripprefix.prefixes=/viction-testnet
+      - traefik.http.middlewares.viction-testnet-node-pruned-leveldb-hash-stripprefix.stripprefix.prefixes=/viction-testnet-node
       - traefik.http.services.viction-testnet-node-pruned-leveldb-hash.loadbalancer.server.port=80
       - ${NO_SSL:-traefik.http.routers.viction-testnet-node-pruned-leveldb-hash.entrypoints=websecure}
       - ${NO_SSL:-traefik.http.routers.viction-testnet-node-pruned-leveldb-hash.tls.certresolver=myresolver}
-      - ${NO_SSL:-traefik.http.routers.viction-testnet-node-pruned-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/viction-testnet`) || Path(`/viction-testnet/`))}
-      - ${NO_SSL:+traefik.http.routers.viction-testnet-node-pruned-leveldb-hash.rule=Path(`/viction-testnet`) || Path(`/viction-testnet/`)}
+      - ${NO_SSL:-traefik.http.routers.viction-testnet-node-pruned-leveldb-hash.rule=Host(`$DOMAIN`) && (Path(`/viction-testnet-node`) || Path(`/viction-testnet-node/`))}
+      - ${NO_SSL:+traefik.http.routers.viction-testnet-node-pruned-leveldb-hash.rule=Path(`/viction-testnet-node`) || Path(`/viction-testnet-node/`)}
       - traefik.http.routers.viction-testnet-node-pruned-leveldb-hash.middlewares=viction-testnet-node-pruned-leveldb-hash-stripprefix, ipallowlist
 
 volumes: