diff --git a/dragonfly-client-init/Dockerfile b/dragonfly-client-init/Dockerfile
index 64bf035b..b71d6434 100644
--- a/dragonfly-client-init/Dockerfile
+++ b/dragonfly-client-init/Dockerfile
@@ -6,10 +6,28 @@ WORKDIR /app/client
 COPY Cargo.toml ./
 COPY Cargo.lock ./
 
+COPY dragonfly-client/Cargo.toml ./dragonfly-client/Cargo.toml
+COPY dragonfly-client/src ./dragonfly-client/src
+
+COPY dragonfly-client-core/Cargo.toml ./dragonfly-client-core/Cargo.toml
+COPY dragonfly-client-core/src ./dragonfly-client-core/src
+
+COPY dragonfly-client-config/Cargo.toml ./dragonfly-client-config/Cargo.toml
+COPY dragonfly-client-config/src ./dragonfly-client-config/src
+
+COPY dragonfly-client-storage/Cargo.toml ./dragonfly-client-storage/Cargo.toml
+COPY dragonfly-client-storage/src ./dragonfly-client-storage/src
+
+COPY dragonfly-client-backend/Cargo.toml ./dragonfly-client-backend/Cargo.toml
+COPY dragonfly-client-backend/src ./dragonfly-client-backend/src
+
+COPY dragonfly-client-util/Cargo.toml ./dragonfly-client-util/Cargo.toml
+COPY dragonfly-client-util/src ./dragonfly-client-util/src
+
 COPY dragonfly-client-init/Cargo.toml ./dragonfly-client-init/Cargo.toml
 COPY dragonfly-client-init/src ./dragonfly-client-init/src
 
-RUN cargo build --release --verbose
+RUN cargo build --release --verbose --bin dfinit
 
 FROM debian:bookworm-slim
 
diff --git a/dragonfly-client/Dockerfile b/dragonfly-client/Dockerfile
index 5e2bb830..daa3b990 100644
--- a/dragonfly-client/Dockerfile
+++ b/dragonfly-client/Dockerfile
@@ -24,7 +24,10 @@ COPY dragonfly-client-backend/src ./dragonfly-client-backend/src
 COPY dragonfly-client-util/Cargo.toml ./dragonfly-client-util/Cargo.toml
 COPY dragonfly-client-util/src ./dragonfly-client-util/src
 
-RUN cargo build --release --verbose
+COPY dragonfly-client-init/Cargo.toml ./dragonfly-client-init/Cargo.toml
+COPY dragonfly-client-init/src ./dragonfly-client-init/src
+
+RUN cargo build --release --verbose --bin dfget --bin dfdaemon --bin dfstore
 
 FROM alpine:3.17 as health