diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
index e3098a93b7c0..a7b60696daa6 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libcomponent.sh
@@ -58,8 +58,8 @@ component_unpack() {
     fi
     if [ -n "$package_sha256" ]; then
         echo "Verifying package integrity"
-        echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check - || exit "$?"
+        echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check - || return "$?"
     fi
-    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2
+    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 || return "$?"
     rm "${base_name}.tar.gz"
 }
diff --git a/bitnami/etcd/README.md b/bitnami/etcd/README.md
index 55dd94b922b9..744b5a34b169 100644
--- a/bitnami/etcd/README.md
+++ b/bitnami/etcd/README.md
@@ -45,7 +45,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`3.5`, `3.5-debian-11`, `3.5.4`, `3.5.4-debian-11-r3`, `latest` (3.5/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.5.4-debian-11-r3/3.5/debian-11/Dockerfile)
+* [`3.5`, `3.5-debian-11`, `3.5.4`, `3.5.4-debian-11-r4`, `latest` (3.5/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.5.4-debian-11-r4/3.5/debian-11/Dockerfile)
 * [`3.4`, `3.4-debian-11`, `3.4.18`, `3.4.18-debian-11-r5` (3.4/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.4.18-debian-11-r5/3.4/debian-11/Dockerfile)
 * [`3.3`, `3.3-debian-11`, `3.3.27`, `3.3.27-debian-11-r5` (3.3/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-etcd/blob/3.3.27-debian-11-r5/3.3/debian-11/Dockerfile)