diff --git a/etcd-tools/Dockerfile b/etcd-tools/Dockerfile
index 0d48a9c..a312455 100644
--- a/etcd-tools/Dockerfile
+++ b/etcd-tools/Dockerfile
@@ -1,15 +1,27 @@
 FROM ubuntu:24.04
 
+ENV ETCD_VERSION=v3.6.5
+ENV ETCD_URL=https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz
+
+
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-      etcd \
-      etcd-client \
       jq \
+      tar \
       busybox \
       curl && \
+    curl -L ${ETCD_URL} -o /tmp/etcd.tar.gz && \
+    tar xzf /tmp/etcd.tar.gz -C /usr/local/bin --strip-components=1 etcd-${ETCD_VERSION}-linux-amd64/etcd etcd-${ETCD_VERSION}-linux-amd64/etcdctl && \
+    rm -rf /tmp/etcd.tar.gz && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-USER etcd
+#RUN groupadd --gid 1000 etcd
+#RUN useradd --gid 1000 etcd
+
+USER ubuntu
+
+RUN etcd --version && etcdctl version
+
 WORKDIR /
 
 ENTRYPOINT ["/bin/sh"]