diff --git a/bitnami/etcd/3.5/debian-11/Dockerfile b/bitnami/etcd/3.5/debian-11/Dockerfile
index bc0d09102d8e..af4718a8db40 100644
--- a/bitnami/etcd/3.5/debian-11/Dockerfile
+++ b/bitnami/etcd/3.5/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-11-20T15:54:45Z" \
+      org.opencontainers.image.created="2023-12-06T15:19:53Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.5.10-debian-11-r2" \
+      org.opencontainers.image.ref.name="3.5.10-debian-11-r3" \
       org.opencontainers.image.title="etcd" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.5.10"
@@ -21,21 +21,21 @@ ENV HOME="/" \
     OS_NAME="linux"
 
 COPY prebuildfs /
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl procps
-RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
+RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "yq-4.40.2-0-linux-${OS_ARCH}-debian-11" \
-      "etcd-3.5.10-1-linux-${OS_ARCH}-debian-11" \
-    ) && \
+      "yq-4.40.4-0-linux-${OS_ARCH}-debian-11" \
+      "etcd-3.5.10-2-linux-${OS_ARCH}-debian-11" \
+    ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
         curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \
         curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz.sha256" -O ; \
-      fi && \
-      sha256sum -c "${COMPONENT}.tar.gz.sha256" && \
-      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' && \
+      fi ; \
+      sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
+      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \
       rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
     done
 RUN apt-get autoremove --purge -y ca-certificates curl && \
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index bd9b4a0fb70a..09b695f11ca2 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,12 +3,12 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "3.5.10-1"
+        "version": "3.5.10-2"
     },
     "yq": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.40.2-0"
+        "version": "4.40.4-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/run-script
index 4ca0f897277e..b7a5bf1e50bf 100755
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/run-script
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/run-script
@@ -10,7 +10,7 @@ fi
 
 script=$1
 exit_code="${2:-96}"
-fail_if_not_present="${3:-n}"
+fail_if_not_present="${3:-y}"
 
 if test -f "$script"; then
   sh $script