diff --git a/bitnami/etcd/3.6/debian-12/Dockerfile b/bitnami/etcd/3.6/debian-12/Dockerfile
index 5d42bfab1e7c..f48a7d3ee8be 100644
--- a/bitnami/etcd/3.6/debian-12/Dockerfile
+++ b/bitnami/etcd/3.6/debian-12/Dockerfile
@@ -3,11 +3,11 @@
 
 FROM docker.io/bitnami/minideb:bookworm
 
-ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
+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-06-05T09:58:40Z" \
+      org.opencontainers.image.created="2026-06-11T02:05:39Z" \
       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,12 +28,12 @@ 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.2-2-linux-${OS_ARCH}-debian-12" \
-      "etcd-3.6.12-1-linux-${OS_ARCH}-debian-12" \
+      "yq-4.53.3-1-linux-${OS_ARCH}-debian-12" \
+      "etcd-3.6.12-2-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
-        curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \
+        curl -SsLf "${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \
       fi ; \
       sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \
       tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \
@@ -50,7 +50,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/etcd/postunpack.sh
 ENV APP_VERSION="3.6.12" \
     BITNAMI_APP_NAME="etcd" \
-    IMAGE_REVISION="2" \
+    IMAGE_REVISION="3" \
     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.12-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-1-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index d50143165465..000000000000
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-1-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-f4733115c8b8847ce94d69875a34b1e69fc38689c0bc37f86ba6c37fdeafc1b9  etcd-3.6.12-1-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-1-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index e65be0a61881..000000000000
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-1-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-1abeb821fa33411a3816dd55b15cd6d57923d7060cbcddffd1545b2b67563a18  etcd-3.6.12-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-2-linux-amd64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..b3f666c25a89
--- /dev/null
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-2-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+05ddec97f87e397d740fc2cff6f98d3ab5e2a6a9ccedaad82c0ff0add9cb8caf  etcd-3.6.12-2-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-2-linux-arm64-debian-12.tar.gz.sha256
new file mode 100644
index 000000000000..9916eb79a9d7
--- /dev/null
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/etcd-3.6.12-2-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+4de17b2562094dcdb6ac3c58625a32c9f4c8dfd19d9ad9c9e7573298c28e62fd  etcd-3.6.12-2-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.2-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.2-2-linux-amd64-debian-12.tar.gz.sha256
deleted file mode 100644
index cea7cc8dd3e4..000000000000
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.2-2-linux-amd64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-50c03f2f9671fe23dcfac131f65db3f1dce7bb6b60d6b081735868079621ce5b  yq-4.53.2-2-linux-amd64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.2-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.2-2-linux-arm64-debian-12.tar.gz.sha256
deleted file mode 100644
index 0897c4064078..000000000000
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.2-2-linux-arm64-debian-12.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-3a0017dcc84cbb89bede3f7ec7b38e7b32fa9e8e93a3f074bd101e9f487255db  yq-4.53.2-2-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
new file mode 100644
index 000000000000..075a7512681f
--- /dev/null
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-amd64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..90ec18816415
--- /dev/null
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-arm64-debian-12.tar.gz.sha256
@@ -0,0 +1 @@
+2613880712b56432dbcecb92a563967a7546b4cc4cac2766b5fa419a231d4f66  yq-4.53.3-1-linux-arm64-debian-12.tar.gz
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
index 9d908c48579b..2d3c3bdb5f4a 100644
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -170,7 +170,7 @@ ensure_user_exists() {
     if [[ -n "$home" ]]; then
         mkdir -p "$home"
         usermod -d "$home" "$user" >/dev/null 2>&1
-        configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group"
+        configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n
     fi
 }
 
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index bbd31b26bb2c..3a996383cfab 100644
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -20,7 +20,7 @@
 #########################
 is_int() {
     local -r int="${1:?missing value}"
-    if [[ "$int" =~ ^-?[0-9]+ ]]; then
+    if [[ "$int" =~ ^-?[0-9]+$ ]]; then
         true
     else
         false
diff --git a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
index f0d5a5cd3389..770861ecedcd 100644
--- a/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/etcd/3.6/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -49,3 +49,36 @@ get_sematic_version () {
         fi
     fi
 }
+
+########################
+# Compares two semantic versions
+# Arguments:
+#   $1 - version1: first version to compare
+#   $2 - version2: second version to compare
+# Returns:
+#   -1 if version1 is less than version2
+#   0 if version1 is equal to version2
+#   1 if version1 is greater than version2
+#########################
+compare_semantic_versions() {
+    local version1="${1:?version1 is required}"
+    local version2="${2:?version2 is required}"
+    local major1 major2 minor1 minor2 patch1 patch2
+
+    major1="$(get_sematic_version "$version1" 1)"
+    major2="$(get_sematic_version "$version2" 1)"
+    minor1="$(get_sematic_version "$version1" 2)"
+    minor2="$(get_sematic_version "$version2" 2)"
+    patch1="$(get_sematic_version "$version1" 3)"
+    patch2="$(get_sematic_version "$version2" 3)"
+
+    if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then
+        echo "0"
+    elif [[ "$major1" -lt "$major2" ]] ||
+      { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } ||
+      { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then
+        echo "-1"
+    else
+        echo "1"
+    fi
+}