diff --git a/src/rust/Dockerfile b/src/rust/Dockerfile
index 7afe444123..63e3db96f0 100644
--- a/src/rust/Dockerfile
+++ b/src/rust/Dockerfile
@@ -20,14 +20,15 @@
 # Base image
 #
 
-FROM rust:alpine AS grapl-rust-base
-RUN apk add --no-cache musl-dev libc6-compat protoc
+FROM rust:1-slim-buster AS grapl-rust-base
+RUN apt-get update && apt-get install -y apt-utils musl musl-dev musl-tools protobuf-compiler libzstd-dev
 ENV PROTOC /usr/bin/protoc
 ENV PROTOC_INCLUDE /usr/include
-RUN adduser -D --gecos '' --home /home/grapl --shell /bin/bash grapl
+RUN adduser --disabled-password --gecos '' --home /home/grapl --shell /bin/bash grapl
 USER grapl
 ENV USER grapl
 WORKDIR /home/grapl
+RUN rustup target add x86_64-unknown-linux-musl
 
 #
 # Dependency build image
@@ -82,9 +83,9 @@ COPY --chown=grapl Cargo.toml .
 RUN mkdir -p /home/grapl/.cargo
 RUN cargo vendor --versioned-dirs --locked > /home/grapl/.cargo/config
 # build all the deps
-RUN RUSTFLAGS="-C target-feature=-crt-static" cargo build
-RUN if [ "${release_target}" == "release" ]; \
-        then RUSTFLAGS="-C target-feature=-crt-static" cargo build --release; \
+RUN cargo build --target=x86_64-unknown-linux-musl
+RUN if test "${release_target}" = "release"; then \
+      cargo build --target=x86_64-unknown-linux-musl --release; \
     fi
 
 #
@@ -103,24 +104,15 @@ COPY --from=grapl-rust-deps-build --chown=grapl /home/grapl/vendor vendor
 # copy in the target directory from grapl-rust-deps-build
 COPY --from=grapl-rust-deps-build --chown=grapl /home/grapl/target target
 # "invalidate" all the grapl services, we want to rebuild them here
-RUN rm -rf target/debug/.fingerprint/analyzer-dispatcher*
-RUN rm -rf target/release/.fingerprint/analyzer-dispatcher*
-RUN rm -rf target/debug/.fingerprint/derive-dynamic-node*
-RUN rm -rf target/release/.fingerprint/derive-dynamic-node*
-RUN rm -rf target/debug/.fingerprint/generic-subgraph-generator*
-RUN rm -rf target/release/.fingerprint/generic-subgraph-generator*
-RUN rm -rf target/debug/.fingerprint/grapl-graph-descriptions*
-RUN rm -rf target/release/.fingerprint/grapl-graph-descriptions*
-RUN rm -rf target/debug/.fingerprint/graph-generator-lib*
-RUN rm -rf target/release/.fingerprint/graph-generator-lib*
-RUN rm -rf target/debug/.fingerprint/grapl-config*
-RUN rm -rf target/release/.fingerprint/grapl-config*
-RUN rm -rf target/debug/.fingerprint/graph-merger*
-RUN rm -rf target/release/.fingerprint/graph-merger*
-RUN rm -rf target/debug/.fingerprint/node-identifier*
-RUN rm -rf target/release/.fingerprint/node-identifier*
-RUN rm -rf target/debug/.fingerprint/sysmon-subgraph-generator*
-RUN rm -rf target/release/.fingerprint/sysmon-subgraph-generator*
+RUN rm -rf target/x86_64-unknown-linux-musl/*/.fingerprint/analyzer-dispatcher*
+RUN rm -rf target/x86_64-unknown-linux-musl/*/.fingerprint/derive-dynamic-node*
+RUN rm -rf target/x86_64-unknown-linux-musl/*/.fingerprint/generic-subgraph-generator*
+RUN rm -rf target/x86_64-unknown-linux-musl/*/.fingerprint/grapl-graph-descriptions*
+RUN rm -rf target/x86_64-unknown-linux-musl/*/.fingerprint/graph-generator-lib*
+RUN rm -rf target/x86_64-unknown-linux-musl/*/.fingerprint/grapl-config*
+RUN rm -rf target/x86_64-unknown-linux-musl/*/.fingerprint/graph-merger*
+RUN rm -rf target/x86_64-unknown-linux-musl/*/.fingerprint/node-identifier*
+RUN rm -rf target/x86_64-unknown-linux-musl/*/.fingerprint/sysmon-subgraph-generator*
 # copy in the sources
 COPY --chown=grapl ./analyzer-dispatcher analyzer-dispatcher
 COPY --chown=grapl ./derive-dynamic-node derive-dynamic-node
@@ -136,7 +128,7 @@ COPY --chown=grapl Cargo.lock .
 COPY --chown=grapl Cargo.toml .
 # build everything
 # FIXME: cargo test instead of cargo build once the tests work
-RUN RUSTFLAGS="-C target-feature=-crt-static" cargo build
-RUN if [ "${release_target}" == "release" ]; \
-      then RUSTFLAGS="-C target-feature=-crt-static" cargo build --release; \
+RUN cargo build --target=x86_64-unknown-linux-musl
+RUN if test "${release_target}" = "release"; then \
+      cargo build --target=x86_64-unknown-linux-musl --release; \
     fi
diff --git a/src/rust/analyzer-dispatcher/Dockerfile b/src/rust/analyzer-dispatcher/Dockerfile
index e402e21106..c8fae05e8d 100644
--- a/src/rust/analyzer-dispatcher/Dockerfile
+++ b/src/rust/analyzer-dispatcher/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine AS grapl-analyzer-dispatcher
 RUN apk add --no-cache libgcc
 ARG release_target="debug"
-COPY --from=grapl/grapl-rust-src-build /home/grapl/target/${release_target}/analyzer-dispatcher /
+COPY --from=grapl/grapl-rust-src-build /home/grapl/target/x86_64-unknown-linux-musl/${release_target}/analyzer-dispatcher /
 CMD ["./analyzer-dispatcher"]
diff --git a/src/rust/generic-subgraph-generator/Dockerfile b/src/rust/generic-subgraph-generator/Dockerfile
index 6133fda21b..a2776d52ce 100644
--- a/src/rust/generic-subgraph-generator/Dockerfile
+++ b/src/rust/generic-subgraph-generator/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine AS grapl-generic-subgraph-generator
 RUN apk add --no-cache libgcc
 ARG release_target="debug"
-COPY --from=grapl/grapl-rust-src-build /home/grapl/target/${release_target}/generic-subgraph-generator /
+COPY --from=grapl/grapl-rust-src-build /home/grapl/target/x86_64-unknown-linux-musl/${release_target}/generic-subgraph-generator /
 CMD ["./generic-subgraph-generator"]
diff --git a/src/rust/graph-merger/Dockerfile b/src/rust/graph-merger/Dockerfile
index 1a4e8cf9e6..fe4e619cc0 100644
--- a/src/rust/graph-merger/Dockerfile
+++ b/src/rust/graph-merger/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine AS grapl-graph-merger
 RUN apk add --no-cache libgcc
 ARG release_target="debug"
-COPY --from=grapl/grapl-rust-src-build /home/grapl/target/${release_target}/graph-merger /
+COPY --from=grapl/grapl-rust-src-build /home/grapl/target/x86_64-unknown-linux-musl/${release_target}/graph-merger /
 CMD ["./graph-merger"]
diff --git a/src/rust/node-identifier/Dockerfile b/src/rust/node-identifier/Dockerfile
index 03a6897b9e..bbb2e16747 100644
--- a/src/rust/node-identifier/Dockerfile
+++ b/src/rust/node-identifier/Dockerfile
@@ -1,11 +1,11 @@
 FROM alpine AS grapl-node-identifier
 RUN apk add --no-cache libgcc
 ARG release_target="debug"
-COPY --from=grapl/grapl-rust-src-build /home/grapl/target/${release_target}/node-identifier /
+COPY --from=grapl/grapl-rust-src-build /home/grapl/target/x86_64-unknown-linux-musl/${release_target}/node-identifier /
 CMD ["./node-identifier"]
 
 FROM alpine AS grapl-node-identifier-retry-handler
 RUN apk add --no-cache libgcc
 ARG release_target="debug"
-COPY --from=grapl/grapl-rust-src-build /home/grapl/target/${release_target}/node-identifier-retry-handler /
+COPY --from=grapl/grapl-rust-src-build /home/grapl/target/x86_64-unknown-linux-musl/${release_target}/node-identifier-retry-handler /
 CMD ["./node-identifier-retry-handler"]
diff --git a/src/rust/sysmon-subgraph-generator/Dockerfile b/src/rust/sysmon-subgraph-generator/Dockerfile
index 68f8ad7467..0833420426 100644
--- a/src/rust/sysmon-subgraph-generator/Dockerfile
+++ b/src/rust/sysmon-subgraph-generator/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine AS grapl-sysmon-subgraph-generator
 RUN apk add --no-cache libgcc
 ARG release_target="debug"
-COPY --from=grapl/grapl-rust-src-build /home/grapl/target/${release_target}/sysmon-subgraph-generator /
+COPY --from=grapl/grapl-rust-src-build /home/grapl/target/x86_64-unknown-linux-musl/${release_target}/sysmon-subgraph-generator /
 CMD ["./sysmon-subgraph-generator"]