diff --git a/plugins/community/neoeinstein-prost-crate/v0.4.0/Dockerfile b/plugins/community/neoeinstein-prost-crate/v0.4.0/Dockerfile
index 6b5542b34..020d88752 100644
--- a/plugins/community/neoeinstein-prost-crate/v0.4.0/Dockerfile
+++ b/plugins/community/neoeinstein-prost-crate/v0.4.0/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 FROM rust:1.76.0-alpine3.19 as builder
 RUN apk add --no-cache musl-dev
 WORKDIR /app
@@ -6,7 +6,10 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
     cargo install protoc-gen-prost-crate --version 0.4.0 --locked --root /app
 
-FROM gcr.io/distroless/static
-COPY --from=builder /app/bin/protoc-gen-prost-crate /protoc-gen-prost-crate
+FROM gcr.io/distroless/static-debian12:latest@sha256:41972110a1c1a5c0b6adb283e8aa092c43c31f7c5d79b8656fbffff2c3e61f05 AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-prost-crate /protoc-gen-prost-crate
 USER nobody
 ENTRYPOINT ["/protoc-gen-prost-crate"]
diff --git a/plugins/community/neoeinstein-prost-serde/v0.3.0/Dockerfile b/plugins/community/neoeinstein-prost-serde/v0.3.0/Dockerfile
index 094d96a6b..aa7cdc9f8 100644
--- a/plugins/community/neoeinstein-prost-serde/v0.3.0/Dockerfile
+++ b/plugins/community/neoeinstein-prost-serde/v0.3.0/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 FROM rust:1.76.0-alpine3.19 as builder
 RUN apk add --no-cache musl-dev
 WORKDIR /app
@@ -6,7 +6,10 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
     cargo install protoc-gen-prost-serde --version 0.3.0 --locked --root /app
 
-FROM gcr.io/distroless/static
-COPY --from=builder /app/bin/protoc-gen-prost-serde /protoc-gen-prost-serde
+FROM gcr.io/distroless/static-debian12:latest@sha256:41972110a1c1a5c0b6adb283e8aa092c43c31f7c5d79b8656fbffff2c3e61f05 AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-prost-serde /protoc-gen-prost-serde
 USER nobody
 ENTRYPOINT ["/protoc-gen-prost-serde"]
diff --git a/plugins/community/neoeinstein-prost/v0.2.3/Dockerfile b/plugins/community/neoeinstein-prost/v0.2.3/Dockerfile
index 8d996ba4c..f4166c128 100644
--- a/plugins/community/neoeinstein-prost/v0.2.3/Dockerfile
+++ b/plugins/community/neoeinstein-prost/v0.2.3/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 FROM rust:1.70.0-alpine3.18 as builder
 RUN apk add --no-cache musl-dev
 WORKDIR /app
@@ -6,7 +6,10 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
     cargo install protoc-gen-prost --version 0.2.3 --locked --root /app
 
-FROM gcr.io/distroless/static
-COPY --from=builder /app/bin/protoc-gen-prost /protoc-gen-prost
+FROM gcr.io/distroless/static-debian12:latest@sha256:41972110a1c1a5c0b6adb283e8aa092c43c31f7c5d79b8656fbffff2c3e61f05 AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-prost /protoc-gen-prost
 USER nobody
 ENTRYPOINT ["/protoc-gen-prost"]
diff --git a/plugins/community/neoeinstein-prost/v0.3.0/Dockerfile b/plugins/community/neoeinstein-prost/v0.3.0/Dockerfile
index 7fbe3ca9c..6b11feb5a 100644
--- a/plugins/community/neoeinstein-prost/v0.3.0/Dockerfile
+++ b/plugins/community/neoeinstein-prost/v0.3.0/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 FROM rust:1.76.0-alpine3.19 as builder
 RUN apk add --no-cache musl-dev
 WORKDIR /app
@@ -6,7 +6,10 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
     cargo install protoc-gen-prost --version 0.3.0 --locked --root /app
 
-FROM gcr.io/distroless/static
-COPY --from=builder /app/bin/protoc-gen-prost /protoc-gen-prost
+FROM gcr.io/distroless/static-debian12:latest@sha256:41972110a1c1a5c0b6adb283e8aa092c43c31f7c5d79b8656fbffff2c3e61f05 AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-prost /protoc-gen-prost
 USER nobody
 ENTRYPOINT ["/protoc-gen-prost"]
diff --git a/plugins/community/neoeinstein-prost/v0.3.1/Dockerfile b/plugins/community/neoeinstein-prost/v0.3.1/Dockerfile
index 007e298d1..ef668056b 100644
--- a/plugins/community/neoeinstein-prost/v0.3.1/Dockerfile
+++ b/plugins/community/neoeinstein-prost/v0.3.1/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 FROM rust:1.76.0-alpine3.19 as builder
 RUN apk add --no-cache musl-dev
 WORKDIR /app
@@ -6,7 +6,10 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
     cargo install protoc-gen-prost --version 0.3.1 --locked --root /app
 
-FROM gcr.io/distroless/static
-COPY --from=builder /app/bin/protoc-gen-prost /protoc-gen-prost
+FROM gcr.io/distroless/static-debian12:latest@sha256:41972110a1c1a5c0b6adb283e8aa092c43c31f7c5d79b8656fbffff2c3e61f05 AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-prost /protoc-gen-prost
 USER nobody
 ENTRYPOINT ["/protoc-gen-prost"]
diff --git a/plugins/community/neoeinstein-tonic/v0.3.0/Dockerfile b/plugins/community/neoeinstein-tonic/v0.3.0/Dockerfile
index b46f47922..c840887a8 100644
--- a/plugins/community/neoeinstein-tonic/v0.3.0/Dockerfile
+++ b/plugins/community/neoeinstein-tonic/v0.3.0/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 FROM rust:1.70.0-alpine3.18 as builder
 RUN apk add --no-cache musl-dev
 WORKDIR /app
@@ -6,7 +6,10 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
     cargo install protoc-gen-tonic --version 0.3.0 --locked --root /app
 
-FROM gcr.io/distroless/static
-COPY --from=builder /app/bin/protoc-gen-tonic /protoc-gen-tonic
+FROM gcr.io/distroless/static-debian12:latest@sha256:41972110a1c1a5c0b6adb283e8aa092c43c31f7c5d79b8656fbffff2c3e61f05 AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-tonic /protoc-gen-tonic
 USER nobody
 ENTRYPOINT ["/protoc-gen-tonic"]
diff --git a/plugins/community/neoeinstein-tonic/v0.4.0/Dockerfile b/plugins/community/neoeinstein-tonic/v0.4.0/Dockerfile
index 0452bbfb4..d2e34b7fb 100644
--- a/plugins/community/neoeinstein-tonic/v0.4.0/Dockerfile
+++ b/plugins/community/neoeinstein-tonic/v0.4.0/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile:1.7
 FROM rust:1.76.0-alpine3.19 as builder
 RUN apk add --no-cache musl-dev
 WORKDIR /app
@@ -6,7 +6,10 @@ ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
     cargo install protoc-gen-tonic --version 0.4.0 --locked --root /app
 
-FROM gcr.io/distroless/static
-COPY --from=builder /app/bin/protoc-gen-tonic /protoc-gen-tonic
+FROM gcr.io/distroless/static-debian12:latest@sha256:41972110a1c1a5c0b6adb283e8aa092c43c31f7c5d79b8656fbffff2c3e61f05 AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-tonic /protoc-gen-tonic
 USER nobody
 ENTRYPOINT ["/protoc-gen-tonic"]