diff --git a/bitnami/etcd/3.6/debian-12/Dockerfile b/bitnami/etcd/3.6/debian-12/Dockerfile
index 9e506c4b5765..3dec3fdd40a4 100644
--- a/bitnami/etcd/3.6/debian-12/Dockerfile
+++ b/bitnami/etcd/3.6/debian-12/Dockerfile
@@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2026-07-06T09:14:50Z" \
+      org.opencontainers.image.created="2026-07-08T07:21:49Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/etcd/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/etcd" \
@@ -28,8 +28,8 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \
     DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \
     mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "yq-4.53.3-1-linux-${OS_ARCH}-debian-12" \
-      "etcd-3.6.13-0-linux-${OS_ARCH}-debian-12" \
+      "yq-4.53.3-2-linux-${OS_ARCH}-debian-12" \
+      "etcd-3.6.13-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -50,7 +50,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/etcd/postunpack.sh
 ENV APP_VERSION="3.6.13" \
     BITNAMI_APP_NAME="etcd" \
-    IMAGE_REVISION="1" \
+    IMAGE_REVISION="2" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/etcd/bin:$PATH"
 
 EXPOSE 2379 2380
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-0-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 89a4ca1234cd..000000000000
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-0-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-d173d0f3454a7d9c4d1075ada2deb3c9f80c082802eae8c305037ffd6dd9748c  etcd-3.6.13-0-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-0-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index bd1dac2f6cc0..000000000000
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-0-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-a7bdb37e8e47660340eb2bb19d185e8c9245ec77b7c0e1bc7b5d99934e216f68  etcd-3.6.13-0-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-1-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..c87c585180fe
--- /dev/null
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-1-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+36b1c5126f936fd0e5331a99060cc22f615d2db535aaee84be6493c5f42c2c60  etcd-3.6.13-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-1-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..23363e8dbe7d
--- /dev/null
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.13-1-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+96a221f6e6f327b181cdf94a81d434d763933f9772ca200d2a95c129d67c4355  etcd-3.6.13-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index 075a7512681f..000000000000
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-adcab17624d76cc523c54bc603664d08341c8817175615ce8bb226d4e527cdec  yq-4.53.3-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 90ec18816415..000000000000
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-2613880712b56432dbcecb92a563967a7546b4cc4cac2766b5fa419a231d4f66  yq-4.53.3-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..159efe9517cd
--- /dev/null
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+d7cb02bda9fa20f362656577296b535e338710f43057803014a124d344b0be04  yq-4.53.3-2-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..d360f0478642
--- /dev/null
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+bbe968c785b1dad4c8ce87248b6770bb779bb7e72b3338a3a123a9c2602712f8  yq-4.53.3-2-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
index a8293800d55c..c1d60a5c5f42 100644
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -424,3 +424,23 @@ EOF
 WantedBy=bitnami.service
 EOF
 }
+
+########################
+# Register a SIGTERM handler that forwards the signal to all child processes.
+# Should be called at the start of run.sh, before launching any background processes.
+# Globals:
+#   None
+# Arguments:
+#   None
+# Returns:
+#   None
+#########################
+service_register_term_forwarder() {
+    _service_forward_term() {
+        warn "Caught signal SIGTERM, passing it to child processes..."
+        pgrep -P $$ | xargs kill -TERM 2>/dev/null
+        wait
+        exit $?
+    }
+    trap _service_forward_term TERM
+}