diff --git a/compose_registry.json b/compose_registry.json
index e69b6929..ec3d8adb 100644
--- a/compose_registry.json
+++ b/compose_registry.json
@@ -1755,6 +1755,21 @@
       "cosmos-mainnet-gaiad-pruned"
     ]
   },
+  {
+    "chain": "mainnet",
+    "client": "cronos",
+    "compose_file": "cronos/cronos/cronos-mainnet-cronos-pruned",
+    "features": [],
+    "network": "cronos",
+    "node": "config",
+    "relay": null,
+    "stack": null,
+    "type": "pruned",
+    "volumes": [
+      "cronos-mainnet-cronos-pruned",
+      "cronos-mainnet-cronos-pruned_config"
+    ]
+  },
   {
     "chain": "zkevm-mainnet",
     "client": "external-node",
@@ -7314,7 +7329,9 @@
     "stack": null,
     "type": "archive",
     "volumes": [
-      "shibarium-mainnet-bor-archive-pebble-path"
+      "shibarium-mainnet-bor-archive-pebble-path",
+      "shibarium-mainnet-bor-archive-pebble-path_config",
+      "shibarium-mainnet-bor-archive-pebble-path_heimdall"
     ]
   },
   {
@@ -7331,7 +7348,9 @@
     "stack": null,
     "type": "pruned",
     "volumes": [
-      "shibarium-mainnet-bor-pruned-pebble-path"
+      "shibarium-mainnet-bor-pruned-pebble-path",
+      "shibarium-mainnet-bor-pruned-pebble-path_config",
+      "shibarium-mainnet-bor-pruned-pebble-path_heimdall"
     ]
   },
   {
diff --git a/cronos/cronos/cronos-mainnet-cronos-pruned.yml b/cronos/cronos/cronos-mainnet-cronos-pruned.yml
new file mode 100644
index 00000000..ff126673
--- /dev/null
+++ b/cronos/cronos/cronos-mainnet-cronos-pruned.yml
@@ -0,0 +1,125 @@
+---
+x-logging-defaults: &logging-defaults
+  driver: json-file
+  options:
+    max-size: "10m"
+    max-file: "3"
+
+# Usage:
+#
+# mkdir rpc && cd rpc
+#
+# git init
+# git remote add origin https://github.com/StakeSquid/ethereum-rpc-docker.git
+# git fetch origin vibe
+# git checkout origin/vibe
+#
+# docker run --rm alpine sh -c "printf '0x'; head -c32 /dev/urandom | xxd -p -c 64" > .jwtsecret
+#
+# env
+# ...
+# IP=$(curl ipinfo.io/ip)
+# DOMAIN=${IP}.traefik.me
+# COMPOSE_FILE=base.yml:rpc.yml:cronos/cronos/cronos-mainnet-cronos-pruned.yml
+#
+# docker compose up -d
+#
+# curl -X POST https://${IP}.traefik.me/cronos-mainnet \
+#   -H "Content-Type: application/json" \
+#   --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":1}'
+
+services:
+  cronos-mainnet:
+    build:
+      context: ./cronos
+      dockerfile: cometbft.Dockerfile
+      args:
+        CRONOS_CRONOS_VERSION: ${CRONOS_MAINNET_CRONOS_VERSION:-v1.7.7}
+        CRONOS_CRONOS_IMAGE: ${CRONOS_MAINNET_CRONOS_IMAGE:-ghcr.io/crypto-org-chain/cronos}
+    sysctls:
+      # TCP Performance
+      net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
+      net.ipv4.tcp_no_metrics_save: 1             # Disable metrics cache
+      net.ipv4.tcp_rmem: 4096 87380 16777216      # Increase TCP read buffers
+      net.ipv4.tcp_wmem: 4096 87380 16777216      # Increase TCP write buffers
+      net.core.somaxconn: 32768                   # Higher connection queue
+      # Memory/Connection Management
+      # net.core.netdev_max_backlog: 50000          # Increase network buffer
+      net.ipv4.tcp_max_syn_backlog: 30000         # More SYN requests
+      net.ipv4.tcp_max_tw_buckets: 2000000        # Allow more TIME_WAIT sockets
+    ulimits:
+      nofile: 1048576    # Max open files (for RPC/WS connections)
+    user: root
+    ports:
+      - 10521:10521
+      - 10521:10521/udp
+    expose:
+      - 8545
+      - 8546
+      - 6066
+      - 26657
+    environment:
+      - API=eth,txpool,net,debug,web3
+      - CHAINID=cronosmainnet_25-1
+      - CHAINNAME=mainnet
+      - IP=${IP}
+      - MONIKER=d${DOMAIN:-local}
+      - P2P_PORT=10521
+    restart: unless-stopped
+    stop_grace_period: 5m
+    networks:
+      - chains
+    volumes:
+      - ${CRONOS_MAINNET_CRONOS_PRUNED_DATA:-cronos-mainnet-cronos-pruned}:/root/.cronos/data
+      - /slowdisk:/slowdisk
+      - cronos-mainnet-cronos-pruned_config:/root/.cronos/config
+    logging: *logging-defaults
+    labels:
+      - prometheus-scrape.enabled=true
+      - prometheus-scrape.port=6066
+      - prometheus-scrape.path=/metrics
+      - traefik.enable=true
+      - traefik.http.middlewares.cronos-mainnet-cronos-pruned-stripprefix.stripprefix.prefixes=/cronos-mainnet
+      - traefik.http.services.cronos-mainnet-cronos-pruned.loadbalancer.server.port=8545
+      - ${NO_SSL:-traefik.http.routers.cronos-mainnet-cronos-pruned.entrypoints=websecure}
+      - ${NO_SSL:-traefik.http.routers.cronos-mainnet-cronos-pruned.tls.certresolver=myresolver}
+      - ${NO_SSL:-traefik.http.routers.cronos-mainnet-cronos-pruned.rule=Host(`$DOMAIN`) && (Path(`/cronos-mainnet`) || Path(`/cronos-mainnet/`))}
+      - ${NO_SSL:+traefik.http.routers.cronos-mainnet-cronos-pruned.rule=Path(`/cronos-mainnet`) || Path(`/cronos-mainnet/`)}
+      - traefik.http.routers.cronos-mainnet-cronos-pruned.middlewares=cronos-mainnet-cronos-pruned-stripprefix, ipallowlist
+      - traefik.http.routers.cronos-mainnet-cronos-pruned.priority=50   # gets any request that is not GET with UPGRADE header
+      - traefik.http.routers.cronos-mainnet-cronos-pruned-ws.priority=100   # answers GET requests first
+      - traefik.http.services.cronos-mainnet-cronos-pruned-ws.loadbalancer.server.port=8546
+      - traefik.http.routers.cronos-mainnet-cronos-pruned-ws.service=cronos-mainnet-cronos-pruned-ws
+      - traefik.http.routers.cronos-mainnet-cronos-pruned.service=cronos-mainnet-cronos-pruned
+      - ${NO_SSL:-traefik.http.routers.cronos-mainnet-cronos-pruned-ws.entrypoints=websecure}
+      - ${NO_SSL:-traefik.http.routers.cronos-mainnet-cronos-pruned-ws.tls.certresolver=myresolver}
+      - ${NO_SSL:-traefik.http.routers.cronos-mainnet-cronos-pruned-ws.rule=Host(`$DOMAIN`) && (Path(`/cronos-mainnet`) || Path(`/cronos-mainnet/`)) && HeadersRegexp(`Upgrade`, `(?i)websocket`)}
+      - ${NO_SSL:+traefik.http.routers.cronos-mainnet-cronos-pruned-ws.rule=(Path(`/cronos-mainnet`) || Path(`/cronos-mainnet/`)) && HeadersRegexp(`Upgrade`, `(?i)websocket`)}
+      - traefik.http.routers.cronos-mainnet-cronos-pruned-ws.middlewares=cronos-mainnet-cronos-pruned-stripprefix, ipallowlist
+
+volumes:
+  cronos-mainnet-cronos-pruned:
+  cronos-mainnet-cronos-pruned_config:
+
+x-upstreams:
+  - id: $${ID}
+    labels:
+      provider: $${PROVIDER}
+    connection:
+      generic:
+        rpc:
+          url: $${RPC_URL}
+        ws:
+          frameSize: 20Mb
+          msgSize: 50Mb
+          url: $${WS_URL}
+    chain: cronos
+    method-groups:
+      enabled:
+        - debug
+        - filter
+    methods:
+      disabled:
+      enabled:
+        - name: txpool_content # TODO: should be disabled for rollup nodes
+...
\ No newline at end of file
diff --git a/cronos/scripts/cometbft-common.sh b/cronos/scripts/cometbft-common.sh
new file mode 100644
index 00000000..e2710b3f
--- /dev/null
+++ b/cronos/scripts/cometbft-common.sh
@@ -0,0 +1,223 @@
+#!/bin/sh
+# cometbft-common.sh — reusable CometBFT-node bootstrap helpers (family C).
+#
+# Source this from a chain-specific init.sh. It encapsulates the operations every
+# CometBFT-consensus node needs (init, fetch config artifacts, patch config.toml /
+# app.toml, seed priv_validator_state), extracted verbatim from the proven berachain
+# beacon-kit entrypoint so callers inherit known-good behavior.
+#
+# Each function takes explicit arguments (paths/values) — it is binary-agnostic. The
+# caller owns the binary name, the `<binary> init` invocation, the artifact URLs, and
+# the final `exec <binary> start ...`. EL-driven chains (beacon-kit, morph) also call
+# the JWT / engine-dial helpers; pure-consensus chains (gaiad) skip them.
+#
+# Conventions: POSIX sh (alpine). Config dir is conventionally $HOME_DIR/config.
+# Used by: morph-node, gaiad (cosmos batch), and any future family-C chain.
+# beacon-kit (berachain) keeps its own bespoke init.sh on purpose — do not retrofit it.
+
+set -e
+
+ct_log() { echo "[cometbft-init] $*"; }
+
+# Ensure curl exists (alpine base images often omit it). Idempotent.
+ct_require_curl() {
+  if ! command -v curl >/dev/null 2>&1; then
+    ct_log "installing curl"
+    apk add --no-cache curl
+  fi
+}
+
+# ct_fetch URL DEST [required]
+#   Download URL -> DEST. If the 3rd arg is "required", a failure is fatal;
+#   otherwise a missing/failed fetch is logged and skipped (returns 0).
+ct_fetch() {
+  _url="$1"; _dest="$2"; _req="${3:-optional}"
+  [ -n "$_url" ] || { [ "$_req" = required ] && { ct_log "FATAL: empty URL for $_dest"; exit 1; }; return 0; }
+  if curl -fsSL "$_url" -o "$_dest"; then
+    ct_log "fetched $_url -> $_dest"
+  else
+    if [ "$_req" = required ]; then
+      ct_log "FATAL: failed to fetch required $_url"; exit 1
+    fi
+    ct_log "skip: could not fetch optional $_url"
+  fi
+}
+
+# ct_patch_p2p CONFIG_TOML IP P2P_PORT
+#   Bind p2p to 0.0.0.0:PORT and advertise IP:PORT (only within the [p2p] section).
+ct_patch_p2p() {
+  _cfg="$1"; _ip="$2"; _port="$3"
+  [ -f "$_cfg" ] || { ct_log "patch_p2p: $_cfg missing, skipping"; return 0; }
+  _laddr="tcp:\\/\\/0\\.0\\.0\\.0\\:${_port}"
+  sed -i "/^\[p2p\]/,/^\[/{s|^laddr = .*|laddr = \"$_laddr\"|}" "$_cfg"
+  sed -i "/^\[p2p\]/,/^\[/{s|^external_address = .*|external_address = \"${_ip}:${_port}\"|}" "$_cfg"
+}
+
+# ct_merge_seeds CONFIG_TOML CONFIGURED_SEEDS [SEEDS_URL]
+#   Merge operator-configured seeds with an optional official seed list (1 entry per
+#   line, first line skipped like the berachain cl-seeds.txt header), dedupe, write.
+ct_merge_seeds() {
+  _cfg="$1"; _seeds="$2"; _url="$3"
+  [ -f "$_cfg" ] || return 0
+  if [ -n "$_url" ]; then
+    _official=$(curl -f -s "$_url" | tail -n +2 | tr '\n' ',' | sed 's/,$//' || true)
+    if [ -n "$_official" ]; then
+      ct_log "merging official seeds from $_url"
+      _seeds=$(echo "${_seeds},${_official}" | tr ',' '\n' | sed '/^$/d' | sort -u | paste -sd,)
+    else
+      ct_log "no official seeds fetched from $_url (continuing with configured)"
+    fi
+  fi
+  if [ -n "$_seeds" ]; then
+    sed -i "s/^seeds = \".*\"/seeds = \"${_seeds}\"/" "$_cfg"
+  fi
+}
+
+# ct_set_persistent_peers CONFIG_TOML PEERS
+#   Handles both cometbft-classic `persistent_peers` (underscore) and forks that use
+#   `persistent-peers` (hyphen, e.g. sei) — patches whichever key is present.
+ct_set_persistent_peers() {
+  _cfg="$1"; _peers="$2"
+  [ -f "$_cfg" ] || return 0
+  [ -n "$_peers" ] || return 0
+  sed -i "s/^persistent_peers = \".*\"/persistent_peers = \"${_peers}\"/" "$_cfg"
+  sed -i "s/^persistent-peers = \".*\"/persistent-peers = \"${_peers}\"/" "$_cfg"
+  return 0
+}
+
+# ct_set_moniker CONFIG_TOML MONIKER
+ct_set_moniker() {
+  _cfg="$1"; _mon="$2"
+  [ -f "$_cfg" ] || return 0
+  [ -n "$_mon" ] && sed -i "s/^moniker = \".*\"/moniker = \"$_mon\"/" "$_cfg"
+  return 0
+}
+
+# ct_set_addrbook CONFIG_DIR ADDRBOOK_URL
+#   Optional: cosmos chains often seed an addrbook.json for faster peer discovery.
+ct_set_addrbook() {
+  _dir="$1"; _url="$2"
+  [ -n "$_url" ] || return 0
+  ct_fetch "$_url" "$_dir/addrbook.json" optional
+}
+
+# ct_write_jwt CONFIG_DIR  [JWT_SRC]
+#   EL-driven chains: copy the shared engine JWT (default /jwtsecret) into the config
+#   dir as jwt.hex so the CL can authenticate to the EL engine API.
+ct_write_jwt() {
+  _dir="$1"; _src="${2:-/jwtsecret}"
+  [ -f "$_src" ] || { ct_log "write_jwt: $_src missing, skipping"; return 0; }
+  cat "$_src" > "$_dir/jwt.hex"
+}
+
+# ct_set_rpc_dial_url APP_TOML AUTH_RPC
+#   beacon-kit / app.toml-style EL engine endpoint (e.g. http://<el>:8551).
+ct_set_rpc_dial_url() {
+  _app="$1"; _rpc="$2"
+  [ -f "$_app" ] || return 0
+  [ -n "$_rpc" ] && sed -i "s|^rpc-dial-url = \".*\"|rpc-dial-url = \"$_rpc\"|" "$_app"
+  return 0
+}
+
+# ct_seed_priv_validator_state HOME_DIR
+#   Ensure data/priv_validator_state.json exists (cometbft refuses to start without it
+#   when one is present in config/). Mirrors the berachain init.sh behavior.
+ct_seed_priv_validator_state() {
+  _home="$1"
+  if [ -e "$_home/config/priv_validator_state.json" ] && [ ! -e "$_home/data/priv_validator_state.json" ]; then
+    mkdir -p "$_home/data"
+    cp "$_home/config/priv_validator_state.json" "$_home/data/priv_validator_state.json"
+  fi
+  return 0
+}
+
+# ct_apk PKG...
+#   Install alpine packages idempotently (most cosmos init scripts need curl, some jq).
+ct_apk() {
+  apk add --no-cache "$@"
+}
+
+# ct_localize_home CONFIG_DIR
+#   Rewrite `~/` to `/root/` in config.toml + app.toml. Cosmos `init` writes home-relative
+#   paths; the container runs as root with a static home, so make paths absolute.
+ct_localize_home() {
+  _dir="$1"
+  [ -f "$_dir/config.toml" ] && sed -i 's|~/|/root/|g' "$_dir/config.toml"
+  [ -f "$_dir/app.toml" ]    && sed -i 's|~/|/root/|g' "$_dir/app.toml"
+  return 0
+}
+
+# ct_set_min_gas_prices APP_TOML PRICE
+#   Cosmos chains reject txs (and sometimes refuse to start) with an empty
+#   minimum-gas-prices. PRICE e.g. "0.01usei", "0.0025uatom", "0.01hqq".
+ct_set_min_gas_prices() {
+  _app="$1"; _price="$2"
+  [ -f "$_app" ] || return 0
+  [ -n "$_price" ] || return 0
+  sed -i "s/minimum-gas-prices = \"\"/minimum-gas-prices = \"${_price}\"/g" "$_app"
+  return 0
+}
+
+# ct_configure_statesync CONFIG_TOML RPC_SERVERS [TRUST_OFFSET]
+#   Enable cometbft state-sync so a fresh node bootstraps near chainhead instead of
+#   replaying from genesis — the single biggest lever for "can't keep it at chainhead"
+#   chains. RPC_SERVERS = comma list of trusted RPC endpoints (>=2 recommended; a single
+#   endpoint is duplicated). TRUST_OFFSET = blocks below head to trust (default 2000).
+#   Requires jq + curl. No-op (logged) if head height can't be fetched.
+ct_configure_statesync() {
+  _cfg="$1"; _rpc="$2"; _offset="${3:-2000}"
+  [ -f "$_cfg" ] || return 0
+  # NEVER re-arm statesync on a node that already has application state (a restored
+  # snapshot or a prior sync). Re-statesyncing over it leaves a broken/partial datadir and,
+  # for wasm chains, drops the wasm files -> startup panic. _cfg is $HOME/config/config.toml,
+  # so application state lives at $HOME/data/application.db.
+  _home=$(dirname "$(dirname "$_cfg")")
+  if [ -e "$_home/data/application.db" ]; then
+    ct_log "statesync: existing data dir, skipping"
+    return 0
+  fi
+  [ -n "$_rpc" ] || { ct_log "statesync: no RPC servers given, skipping"; return 0; }
+  _primary=$(echo "$_rpc" | cut -d, -f1)
+  _latest=$(curl -s "$_primary/block" | jq -r '.result.block.header.height // .block.header.height' 2>/dev/null || true)
+  if [ -z "$_latest" ] || [ "$_latest" = null ]; then
+    ct_log "statesync: could not read head height from $_primary, skipping"; return 0
+  fi
+  _trust_h=$((_latest - _offset))
+  _trust_hash=$(curl -s "$_primary/block?height=$_trust_h" | jq -r '.result.block_id.hash // .block_id.hash' 2>/dev/null || true)
+  [ -n "$_trust_hash" ] && [ "$_trust_hash" != null ] || { ct_log "statesync: no trust hash, skipping"; return 0; }
+  # second server defaults to the first (cometbft wants >=2 for light-client cross-check)
+  echo "$_rpc" | grep -q ',' || _rpc="$_rpc,$_rpc"
+  ct_log "statesync: enable trust_height=$_trust_h trust_hash=$_trust_hash"
+  # Patch ONLY the [statesync] section. CometBFT config.toml uses underscore keys
+  # (rpc_servers/trust_height/trust_hash); tolerate hyphen variants with [_-].
+  sed -i.bak -E "/^\[statesync\]/,/^\[/{
+    s|^([[:space:]]*enable[[:space:]]*=[[:space:]]*).*|\1true|
+    s|^([[:space:]]*rpc[_-]servers[[:space:]]*=[[:space:]]*).*|\1\"$_rpc\"|
+    s|^([[:space:]]*trust[_-]height[[:space:]]*=[[:space:]]*).*|\1$_trust_h|
+    s|^([[:space:]]*trust[_-]hash[[:space:]]*=[[:space:]]*).*|\1\"$_trust_hash\"|
+  }" "$_cfg"
+  return 0
+}
+
+# ct_ensure_wasm HOME_DIR WASM_SNAPSHOT_URL
+#   CosmWasm + IBC 08-wasm bytecode are FILES on disk that state-sync does NOT restore, so
+#   a state-synced wasm chain panics at startup ("wasmlckeeper failed initialize pinned codes
+#   / Error opening Wasm file"). Seed them from a wasm-only snapshot (e.g. polkachu
+#   cosmos_wasmonly.tar.lz4) when the wasm dir is missing/empty. No-op if URL unset or wasm
+#   already present. Best-effort (logs on failure); the fully robust path for wasm chains is a
+#   FULL snapshot restore. Requires lz4 + tar (installed here).
+ct_ensure_wasm() {
+  _home="$1"; _url="$2"
+  [ -n "$_url" ] || return 0
+  if [ -d "$_home/wasm" ] && [ -n "$(ls -A "$_home/wasm" 2>/dev/null)" ]; then
+    return 0   # wasm already present
+  fi
+  ct_log "wasm: empty, fetching snapshot $_url"
+  ct_apk lz4 tar
+  if curl -sL "$_url" | lz4 -dc | tar -xf - -C "$_home"; then
+    ct_log "wasm: extracted into $_home"
+  else
+    ct_log "WARN wasm: fetch/extract failed ($_url)"
+  fi
+  return 0
+}
diff --git a/shibarium/bor/shibarium-mainnet-bor-archive-pebble-path.yml b/shibarium/bor/shibarium-mainnet-bor-archive-pebble-path.yml
index 9eb78597..99517209 100644
--- a/shibarium/bor/shibarium-mainnet-bor-archive-pebble-path.yml
+++ b/shibarium/bor/shibarium-mainnet-bor-archive-pebble-path.yml
@@ -30,7 +30,12 @@ x-logging-defaults: &logging-defaults
 
 services:
   shibarium-mainnet-archive:
-    image: ${SHIBARIUM_BOR_IMAGE:-0xpolygon/bor}:${SHIBARIUM_MAINNET_BOR_VERSION:-}
+    build:
+      context: ./shibarium
+      dockerfile: bor.Dockerfile
+      args:
+        BOR_REPO: ${SHIBARIUM_MAINNET_BOR_REPO:-https://github.com/shibaone/bor}
+        BOR_VERSION: ${SHIBARIUM_MAINNET_BOR_VERSION:-v1.3.9-bone}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -55,10 +60,9 @@ services:
     entrypoint: [bor, server]
     command:
       - --bor.heimdall=http://shibarium-mainnet-node:1317
-      - --chain=mainnet
+      - --chain=shibarium
       - --datadir=/root/.bor/
       - --db.engine=pebble
-      - --discovery.dns=
       - --gcmode=archive
       - --maxpeers=50
       - --metrics
@@ -105,8 +109,51 @@ services:
       - ${NO_SSL:+traefik.http.routers.shibarium-mainnet-bor-archive-pebble-path.rule=Path(`/shibarium-mainnet-archive`) || Path(`/shibarium-mainnet-archive/`)}
       - traefik.http.routers.shibarium-mainnet-bor-archive-pebble-path.middlewares=shibarium-mainnet-bor-archive-pebble-path-stripprefix, ipallowlist
 
+  shibarium-mainnet-archive-node:
+    build:
+      context: ./shibarium
+      dockerfile: cometbft.Dockerfile
+      args:
+        CL_IMAGE: ${SHIBARIUM_MAINNET_HEIMDALL_IMAGE:-shibaone/heimdall}
+        CL_VERSION: ${SHIBARIUM_MAINNET_HEIMDALL_VERSION:-v1.0.7-bone}
+    ports:
+      - 1317:1317
+      - 26656:26656
+      - 26656:26656/udp
+      - 26657:26657
+      - 26657:26657/udp
+    expose:
+      - '26656'
+      - '26657'
+      - '1317'
+    environment:
+      - CHAIN_ID=109
+      - GENESIS_URL=https://raw.githubusercontent.com/shibaone/heimdall/v1.0.7-bone/builder/files/genesis-shibarium.json
+      - IP=${IP}
+      - MONIKER=d${DOMAIN:-local}
+      - P2P_PORT=26656
+      - PERSISTENT_PEERS=${SHIBARIUM_MAINNET_HEIMDALL_PEERS:-96f333f77d5e2f877d3afe4a3643e4f99949ef5c@44.204.200.100:26656,e6676c16d8a9ec98bbbce8d137a3765632720328@18.136.201.99:26656,8c71c016de039e50e48f74683784054f46bd0a1c@3.99.233.157:26656,fb613910f04f0ae0001d93b70552d4d5c358ad78@63.32.53.219:26656,08c3509327941a593eef258f23ab568c10d28905@52.12.214.141:26656}
+    command:
+      - -c
+      - 'exec heimdalld start --home $${CMT_HOME:-/root/.heimdalld} --chain 109 --rest-server --rest-server.addr=0.0.0.0:1317 --rpc.laddr=tcp://0.0.0.0:26657 --p2p.laddr=tcp://0.0.0.0:26656'
+      - sh
+    restart: unless-stopped
+    networks:
+      - chains
+    volumes:
+      - ${SHIBARIUM_MAINNET_BOR_ARCHIVE_PEBBLE_PATH__HEIMDALL_DATA:-shibarium-mainnet-bor-archive-pebble-path_heimdall}:/root/.heimdalld
+      - .jwtsecret:/jwtsecret:ro
+      - shibarium-mainnet-bor-archive-pebble-path_config:/root/.heimdalld/config
+    logging: *logging-defaults
+    labels:
+      - prometheus-scrape.enabled=true
+      - prometheus-scrape.port=26660
+      - prometheus-scrape.path=/metrics
+
 volumes:
   shibarium-mainnet-bor-archive-pebble-path:
+  shibarium-mainnet-bor-archive-pebble-path_config:
+  shibarium-mainnet-bor-archive-pebble-path_heimdall:
 
 x-upstreams:
   - id: $${ID}
diff --git a/shibarium/bor/shibarium-mainnet-bor-pruned-pebble-path.yml b/shibarium/bor/shibarium-mainnet-bor-pruned-pebble-path.yml
index 1a8b35ad..4b9ba0aa 100644
--- a/shibarium/bor/shibarium-mainnet-bor-pruned-pebble-path.yml
+++ b/shibarium/bor/shibarium-mainnet-bor-pruned-pebble-path.yml
@@ -30,7 +30,12 @@ x-logging-defaults: &logging-defaults
 
 services:
   shibarium-mainnet:
-    image: ${SHIBARIUM_BOR_IMAGE:-0xpolygon/bor}:${SHIBARIUM_MAINNET_BOR_VERSION:-}
+    build:
+      context: ./shibarium
+      dockerfile: bor.Dockerfile
+      args:
+        BOR_REPO: ${SHIBARIUM_MAINNET_BOR_REPO:-https://github.com/shibaone/bor}
+        BOR_VERSION: ${SHIBARIUM_MAINNET_BOR_VERSION:-v1.3.9-bone}
     sysctls:
       # TCP Performance
       net.ipv4.tcp_slow_start_after_idle: 0       # Disable slow start after idle
@@ -55,10 +60,9 @@ services:
     entrypoint: [bor, server]
     command:
       - --bor.heimdall=http://shibarium-mainnet-node:1317
-      - --chain=mainnet
+      - --chain=shibarium
       - --datadir=/root/.bor/
       - --db.engine=pebble
-      - --discovery.dns=
       - --gcmode=full
       - --maxpeers=50
       - --metrics
@@ -105,8 +109,51 @@ services:
       - ${NO_SSL:+traefik.http.routers.shibarium-mainnet-bor-pruned-pebble-path.rule=Path(`/shibarium-mainnet`) || Path(`/shibarium-mainnet/`)}
       - traefik.http.routers.shibarium-mainnet-bor-pruned-pebble-path.middlewares=shibarium-mainnet-bor-pruned-pebble-path-stripprefix, ipallowlist
 
+  shibarium-mainnet-node:
+    build:
+      context: ./shibarium
+      dockerfile: cometbft.Dockerfile
+      args:
+        CL_IMAGE: ${SHIBARIUM_MAINNET_HEIMDALL_IMAGE:-shibaone/heimdall}
+        CL_VERSION: ${SHIBARIUM_MAINNET_HEIMDALL_VERSION:-v1.0.7-bone}
+    ports:
+      - 1317:1317
+      - 26656:26656
+      - 26656:26656/udp
+      - 26657:26657
+      - 26657:26657/udp
+    expose:
+      - '26656'
+      - '26657'
+      - '1317'
+    environment:
+      - CHAIN_ID=109
+      - GENESIS_URL=https://raw.githubusercontent.com/shibaone/heimdall/v1.0.7-bone/builder/files/genesis-shibarium.json
+      - IP=${IP}
+      - MONIKER=d${DOMAIN:-local}
+      - P2P_PORT=26656
+      - PERSISTENT_PEERS=${SHIBARIUM_MAINNET_HEIMDALL_PEERS:-96f333f77d5e2f877d3afe4a3643e4f99949ef5c@44.204.200.100:26656,e6676c16d8a9ec98bbbce8d137a3765632720328@18.136.201.99:26656,8c71c016de039e50e48f74683784054f46bd0a1c@3.99.233.157:26656,fb613910f04f0ae0001d93b70552d4d5c358ad78@63.32.53.219:26656,08c3509327941a593eef258f23ab568c10d28905@52.12.214.141:26656}
+    command:
+      - -c
+      - 'exec heimdalld start --home $${CMT_HOME:-/root/.heimdalld} --chain 109 --rest-server --rest-server.addr=0.0.0.0:1317 --rpc.laddr=tcp://0.0.0.0:26657 --p2p.laddr=tcp://0.0.0.0:26656'
+      - sh
+    restart: unless-stopped
+    networks:
+      - chains
+    volumes:
+      - ${SHIBARIUM_MAINNET_BOR_PRUNED_PEBBLE_PATH__HEIMDALL_DATA:-shibarium-mainnet-bor-pruned-pebble-path_heimdall}:/root/.heimdalld
+      - .jwtsecret:/jwtsecret:ro
+      - shibarium-mainnet-bor-pruned-pebble-path_config:/root/.heimdalld/config
+    logging: *logging-defaults
+    labels:
+      - prometheus-scrape.enabled=true
+      - prometheus-scrape.port=26660
+      - prometheus-scrape.path=/metrics
+
 volumes:
   shibarium-mainnet-bor-pruned-pebble-path:
+  shibarium-mainnet-bor-pruned-pebble-path_config:
+  shibarium-mainnet-bor-pruned-pebble-path_heimdall:
 
 x-upstreams:
   - id: $${ID}