diff --git a/shibarium/cometbft.Dockerfile b/shibarium/cometbft.Dockerfile
index 752acc87..022a5589 100644
--- a/shibarium/cometbft.Dockerfile
+++ b/shibarium/cometbft.Dockerfile
@@ -1,40 +1,25 @@
-# Shibarium heimdall consensus node — BUILT FROM SOURCE.
-#
-# shibaone publishes NO heimdall docker image (only source + release .deb config
-# packages), so we cannot `FROM shibaone/heimdall:<tag>` — that tag does not exist
-# on any registry. Instead we mirror the upstream shibaone/heimdall Dockerfile
-# (`make install`) but clone the pinned tag, then layer the vibe-node CometBFT
-# bootstrap entrypoint (init.sh + cometbft-common.sh).
+# Shibarium heimdall node Dockerfile
+# Build from the base heimdall image + copy entrypoint scripts.
+# Uses the standard cometbft-node pattern from vibe-node.
 #
 # Build args:
-#   CL_REPO     - heimdall source repo  (default: https://github.com/shibaone/heimdall)
-#   CL_VERSION  - heimdall version tag  (passed by the template, e.g. v1.0.7-bone)
+#   CL_IMAGE     - base heimdall image (default: shibaone/heimdall)
+#   CL_VERSION   - heimdall version tag
 #
-# `make install` puts heimdalld + heimdallcli on /go/bin (already on PATH).
-# The entrypoint is init.sh: it sources cometbft-common.sh, runs heimdalld init
-# --chain shibarium, fetches the heimdall-109 genesis from GENESIS_URL, sets the
-# shibarium seeds/persistent_peers, then exec's `heimdalld start --rest-server`.
+# The entrypoint is init.sh which sources cometbft-common.sh and bootstraps
+# the node before exec'ing heimdalld start.
 
-ARG CL_REPO=https://github.com/shibaone/heimdall
+ARG CL_IMAGE=shibaone/heimdall
 ARG CL_VERSION=v1.0.7-bone
 
-FROM golang:1.22
+FROM ${CL_IMAGE}:${CL_VERSION}
 
-ARG CL_REPO
-ARG CL_VERSION
-
-RUN apt-get update -y && apt-get upgrade -y \
-    && apt-get install -y --no-install-recommends build-essential git curl jq ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /var/lib/heimdall
-RUN git clone --depth 1 --branch ${CL_VERSION} ${CL_REPO} . \
-    && make install
-
-# vibe-node CometBFT bootstrap entrypoint (context is ./shibarium)
+# Copy the shared CometBFT helpers and chain-specific entrypoint
 COPY ./scripts/cometbft-common.sh /usr/local/bin/cometbft-common.sh
 COPY ./scripts/init.sh            /usr/local/bin/init.sh
-RUN chmod +x /usr/local/bin/init.sh /usr/local/bin/cometbft-common.sh
 
-EXPOSE 1317 26656 26657
+# Make init.sh executable
+RUN chmod +x /usr/local/bin/init.sh
+
+# Set entrypoint to our init script
 ENTRYPOINT ["init.sh"]