diff --git a/Dockerfile b/Dockerfile
index d68472c..221c3ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,61 @@
 ####################################################################################################
 ## Builder
 ####################################################################################################
-FROM rust:latest AS builder
+FROM --platform=$BUILDPLATFORM rust:latest AS rust-builder
 
 RUN update-ca-certificates
 
+RUN apt-get update && apt-get install -y \
+    g++-x86-64-linux-gnu libc6-dev-amd64-cross \
+    g++-aarch64-linux-gnu libc6-dev-arm64-cross && \
+    rm -rf /var/lib/apt/lists/*
+RUN rustup target add \
+    x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
+RUN rustup toolchain install \
+    stable-x86_64-unknown-linux-gnu stable-aarch64-unknown-linux-gnu
+RUN rustup component add rustfmt
+ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=x86_64-linux-gnu-gcc \
+    CC_x86_64_unknown_linux_gnu=x86_64-linux-gnu-gcc \
+    CXX_x86_64_unknown_linux_gnu=x86_64-linux-gnu-g++ \
+    CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
+    CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
+    CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
+    CARGO_INCREMENTAL=0
+
+
+
+# amd64 build ----------------------------
+FROM --platform=$BUILDPLATFORM rust-builder AS build-amd64
+WORKDIR /isotope
+COPY . .
+RUN cargo install --target x86_64-unknown-linux-gnu --path .
+RUN mv ./target/x86_64-unknown-linux-gnu/release/isotope /usr/bin/isotope
+ 
+# arm64 build ----------------------------
+FROM --platform=$BUILDPLATFORM rust-builder AS build-arm64
+WORKDIR /isotope
+COPY . .
+RUN cargo install --target aarch64-unknown-linux-gnu --path .
+RUN mv ./target/aarch64-unknown-linux-gnu/release/isotope /usr/bin/isotope
+
+# Final arch images ----------------------
+ 
+# FROM --platform=amd64 gcr.io/distroless/cc AS final-amd64
+FROM --platform=amd64 debian:bullseye AS final-amd64
+COPY --from=build-amd64 /usr/bin/isotope /usr/bin/isotope
+COPY --from=build-amd64 /lib/x86_64-linux-gnu/libc.so.6 /lib/x86_64-linux-gnu/libc.so.6
+
+# FROM --platform=arm64 gcr.io/distroless/cc AS final-arm64
+FROM --platform=arm64 debian:bullseye AS final-arm64
+COPY --from=build-arm64 /usr/bin/isotope /usr/bin/isotope
+COPY --from=build-arm64  /lib/aarch64-linux-gnu/libc.so.6 /lib/aarch64-linux-gnu/libc.so.6
+ 
+
+####################################################################################################
+## Final image
+####################################################################################################
+FROM final-${TARGETARCH}
+
 ENV USER=isotope_user
 ENV UID=10001
 
@@ -18,38 +69,7 @@ RUN adduser \
     "${USER}"
 
 
-WORKDIR /isotope
-
-COPY ./ .
-
-# We no longer need to use the x86_64-unknown-linux-musl target
-RUN cargo build --release
-
-
-####################################################################################################
-## Copy last version of libc library for amd64 and arm64 archs
-####################################################################################################
-FROM --platform=amd64 gcr.io/distroless/cc AS final-amd64
-COPY --from=builder /lib/x86_64-linux-gnu/libc.so.6 /lib/x86_64-linux-gnu/libc.so.6
-
-FROM --platform=arm64 gcr.io/distroless/cc AS final-arm64
-COPY --from=builder /lib/aarch64-linux-gnu/libc.so.6 /lib/aarch64-linux-gnu/libc.so.6
-
-####################################################################################################
-## Final image
-####################################################################################################
-FROM final-${TARGETARCH}
-
-# Import from builder.
-COPY --from=builder /etc/passwd /etc/passwd
-COPY --from=builder /etc/group /etc/group
-
-WORKDIR /isotope
-
-# Copy our build
-COPY --from=builder /isotope/target/release/isotope ./
-
 # Use an unprivileged user.
 USER isotope_user:isotope_user
 
-CMD ["/isotope/isotope"]
+CMD ["/usr/bin/isotope/isotope"]