diff --git a/stack-orchestrator/container-build/cerc-lotus-node/Dockerfile b/stack-orchestrator/container-build/cerc-lotus-node/Dockerfile
index 9a76736..43736a5 100644
--- a/stack-orchestrator/container-build/cerc-lotus-node/Dockerfile
+++ b/stack-orchestrator/container-build/cerc-lotus-node/Dockerfile
@@ -34,8 +34,6 @@ COPY ./ /opt/filecoin
 
 WORKDIR /opt/filecoin
 
-RUN scripts/docker-git-state-check.sh
-
 ### make configurable filecoin-ffi build
 ARG FFI_BUILD_FROM_SOURCE=0
 ENV FFI_BUILD_FROM_SOURCE=${FFI_BUILD_FROM_SOURCE}
@@ -47,6 +45,13 @@ ARG GOFLAGS=""
 
 RUN make buildall
 
+### build for calibnet
+COPY ./ /opt/filecoin-calibnet
+WORKDIR /opt/filecoin-calibnet
+
+RUN make clean deps
+RUN make calibnet
+
 #####################################
 FROM ubuntu:20.04 AS lotus-base
 MAINTAINER Lotus Development Team
@@ -72,6 +77,10 @@ MAINTAINER Lotus Development Team
 
 COPY --from=lotus-builder /opt/filecoin/lotus /usr/local/bin/
 COPY --from=lotus-builder /opt/filecoin/lotus-shed /usr/local/bin/
+
+COPY --from=lotus-builder /opt/filecoin-calibnet/lotus /usr/local/bin/lotus-calibnet
+COPY --from=lotus-builder /opt/filecoin-calibnet/lotus-shed /usr/local/bin/lotus-calibnet-shed
+
 COPY scripts/docker-lotus-entrypoint.sh /
 
 ARG DOCKER_LOTUS_IMPORT_SNAPSHOT=https://forest-archive.chainsafe.dev/latest/mainnet/
@@ -97,6 +106,9 @@ CMD ["-help"]
 #####################################
 FROM lotus-base AS lotus-all-in-one
 
+# Install netcat for healthcheck
+RUN apt-get update && apt-get install -y netcat && apt-get install -y iproute2
+
 ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
 ENV LOTUS_MINER_PATH /var/lib/lotus-miner
 ENV LOTUS_PATH /var/lib/lotus
@@ -114,6 +126,9 @@ COPY --from=lotus-builder /opt/filecoin/curio    /usr/local/bin/
 COPY --from=lotus-builder /opt/filecoin/lotus-stats    /usr/local/bin/
 COPY --from=lotus-builder /opt/filecoin/lotus-fountain /usr/local/bin/
 
+COPY --from=lotus-builder /opt/filecoin-calibnet/lotus          /usr/local/bin/lotus-calibnet
+COPY --from=lotus-builder /opt/filecoin-calibnet/lotus-seed     /usr/local/bin/lotus-calibnet-seed
+
 RUN mkdir /var/tmp/filecoin-proof-parameters
 RUN mkdir /var/lib/lotus
 RUN mkdir /var/lib/lotus-miner