diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md
index e97c3e1a6..94dcbc06f 100644
--- a/CHANGELOG-3.6.md
+++ b/CHANGELOG-3.6.md
@@ -50,4 +50,8 @@ See [List of metrics](https://etcd.io/docs/latest/metrics/) for all metrics per
 
 - Add [`etcd_disk_defrag_inflight`](https://github.com/etcd-io/etcd/pull/13371).
 
+### Other
+
+- Use Distroless as base image to make the image less vulnerable and reduce image size.
+
 <hr>
diff --git a/Dockerfile-release.amd64 b/Dockerfile-release.amd64
index cb93afe76..67400b696 100644
--- a/Dockerfile-release.amd64
+++ b/Dockerfile-release.amd64
@@ -1,5 +1,5 @@
 FROM --platform=linux/amd64 busybox:1.34.1 as source
-FROM --platform=linux/amd64  gcr.io/distroless/base-debian11
+FROM --platform=linux/amd64 gcr.io/distroless/base-debian11
 
 COPY --from=source /bin/sh /bin/sh
 COPY --from=source /bin/mkdir /bin/mkdir
diff --git a/Dockerfile-release.arm64 b/Dockerfile-release.arm64
index 53d3c2741..b8ce477af 100644
--- a/Dockerfile-release.arm64
+++ b/Dockerfile-release.arm64
@@ -1,5 +1,5 @@
 FROM --platform=linux/arm64 busybox:1.34.1 as source
-FROM --platform=linux/arm64  gcr.io/distroless/base-debian11
+FROM --platform=linux/arm64 gcr.io/distroless/base-debian11
 
 COPY --from=source /bin/sh /bin/sh
 COPY --from=source /bin/mkdir /bin/mkdir
diff --git a/Dockerfile-release.ppc64le b/Dockerfile-release.ppc64le
index 81fc64bc6..9cfe5d433 100644
--- a/Dockerfile-release.ppc64le
+++ b/Dockerfile-release.ppc64le
@@ -1,10 +1,9 @@
 FROM --platform=linux/ppc64le busybox:1.34.1 as source
-FROM --platform=linux/ppc64le  gcr.io/distroless/base-debian11
+FROM --platform=linux/ppc64le gcr.io/distroless/base-debian11
 
 COPY --from=source /bin/sh /bin/sh
 COPY --from=source /bin/mkdir /bin/mkdir
 
-
 ADD etcd /usr/local/bin/
 ADD etcdctl /usr/local/bin/
 ADD etcdutl /usr/local/bin/
diff --git a/Dockerfile-release.s390x b/Dockerfile-release.s390x
index 42bc5d5a0..d901b410c 100644
--- a/Dockerfile-release.s390x
+++ b/Dockerfile-release.s390x
@@ -1,5 +1,5 @@
 FROM --platform=linux/s390x busybox:1.34.1 as source
-FROM --platform=linux/s390x  gcr.io/distroless/base-debian11
+FROM --platform=linux/s390x gcr.io/distroless/base-debian11
 
 COPY --from=source /bin/sh /bin/sh
 COPY --from=source /bin/mkdir /bin/mkdir