diff --git a/stack-orchestrator/container-build/cerc-lotus-node/Dockerfile b/stack-orchestrator/container-build/cerc-lotus-node/Dockerfile
index 0229e2a..9a76736 100644
--- a/stack-orchestrator/container-build/cerc-lotus-node/Dockerfile
+++ b/stack-orchestrator/container-build/cerc-lotus-node/Dockerfile
@@ -31,26 +31,21 @@ RUN set -eux; \
     rustc --version;
 
 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}
 
-#RUN make clean deps
+RUN make clean deps
 
 ARG RUSTFLAGS=""
 ARG GOFLAGS=""
 
-RUN make clean deps && \
-    make lotus lotus-shed lotus-stats && \
-    install -C ./lotus /usr/local/bin/lotus && \
-    install -C ./lotus-shed /usr/local/bin/lotus-shed && \
-    install -C ./lotus-stats /usr/local/bin/lotus-stats
-
-RUN make clean deps && \
-    make calibnet && \
-    install -C ./lotus /usr/local/bin/lotus-calibnet && \
-    install -C ./lotus-shed /usr/local/bin/lotus-calibnet-shed
+RUN make buildall
 
 #####################################
 FROM ubuntu:20.04 AS lotus-base
@@ -75,13 +70,12 @@ RUN useradd -r -u 532 -U fc \
 FROM lotus-base AS lotus
 MAINTAINER Lotus Development Team
 
-COPY --from=lotus-builder \
-    /usr/local/bin/lotus \
-    /usr/local/bin/lotus-shed \
-    /usr/local/bin/lotus-calibnet \
-    /usr/local/bin/lotus-calibnet-shed \
-    /usr/local/bin/
+COPY --from=lotus-builder /opt/filecoin/lotus /usr/local/bin/
+COPY --from=lotus-builder /opt/filecoin/lotus-shed /usr/local/bin/
+COPY scripts/docker-lotus-entrypoint.sh /
 
+ARG DOCKER_LOTUS_IMPORT_SNAPSHOT=https://forest-archive.chainsafe.dev/latest/mainnet/
+ENV DOCKER_LOTUS_IMPORT_SNAPSHOT ${DOCKER_LOTUS_IMPORT_SNAPSHOT}
 ENV FILECOIN_PARAMETER_CACHE /var/tmp/filecoin-proof-parameters
 ENV LOTUS_PATH /var/lib/lotus
 ENV DOCKER_LOTUS_IMPORT_WALLET ""
@@ -96,38 +90,52 @@ USER fc
 
 EXPOSE 1234
 
+ENTRYPOINT ["/docker-lotus-entrypoint.sh"]
 
 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
-
-ARG DOCKER_LOTUS_IMPORT_SNAPSHOT=https://forest-archive.chainsafe.dev/latest/mainnet/
-ENV DOCKER_LOTUS_IMPORT_SNAPSHOT=${DOCKER_LOTUS_IMPORT_SNAPSHOT}
+ENV LOTUS_WORKER_PATH /var/lib/lotus-worker
+ENV WALLET_PATH /var/lib/lotus-wallet
 
 COPY --from=lotus-builder /opt/filecoin/lotus          /usr/local/bin/
+COPY --from=lotus-builder /opt/filecoin/lotus-seed     /usr/local/bin/
 COPY --from=lotus-builder /opt/filecoin/lotus-shed     /usr/local/bin/
+COPY --from=lotus-builder /opt/filecoin/lotus-wallet   /usr/local/bin/
+COPY --from=lotus-builder /opt/filecoin/lotus-gateway  /usr/local/bin/
+COPY --from=lotus-builder /opt/filecoin/lotus-miner    /usr/local/bin/
+COPY --from=lotus-builder /opt/filecoin/lotus-worker   /usr/local/bin/
+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-calibnet /usr/local/bin/
-COPY --from=lotus-builder /opt/filecoin/lotus-calibnet-shed /usr/local/bin/
-COPY scripts/docker-lotus-entrypoint.sh /docker-lotus-entrypoint.sh
-RUN chmod +x /docker-lotus-entrypoint.sh
+COPY --from=lotus-builder /opt/filecoin/lotus-fountain /usr/local/bin/
 
 RUN mkdir /var/tmp/filecoin-proof-parameters
 RUN mkdir /var/lib/lotus
+RUN mkdir /var/lib/lotus-miner
+RUN mkdir /var/lib/lotus-worker
+RUN mkdir /var/lib/lotus-wallet
+RUN mkdir /var/lib/curio
 RUN chown fc: /var/tmp/filecoin-proof-parameters
 RUN chown fc: /var/lib/lotus
+RUN chown fc: /var/lib/lotus-miner
+RUN chown fc: /var/lib/lotus-worker
+RUN chown fc: /var/lib/lotus-wallet
+RUN chown fc: /var/lib/curio
 
 
 VOLUME /var/tmp/filecoin-proof-parameters
 VOLUME /var/lib/lotus
+VOLUME /var/lib/lotus-miner
+VOLUME /var/lib/lotus-worker
+VOLUME /var/lib/lotus-wallet
+VOLUME /var/lib/curio
 
 EXPOSE 1234
-EXPOSE 1235
-
+EXPOSE 2345
+EXPOSE 3456
+EXPOSE 1777
\ No newline at end of file