diff --git a/bitnami/zookeeper/3.6/debian-11/Dockerfile b/bitnami/zookeeper/3.6/debian-11/Dockerfile
index afeb86fe40c2..7cc6698820bc 100644
--- a/bitnami/zookeeper/3.6/debian-11/Dockerfile
+++ b/bitnami/zookeeper/3.6/debian-11/Dockerfile
@@ -1,6 +1,4 @@
 FROM docker.io/bitnami/minideb:bullseye
-LABEL maintainer "Bitnami <containers@bitnami.com>"
-
 ENV HOME="/" \
     OS_ARCH="amd64" \
     OS_FLAVOUR="debian-11" \
@@ -8,6 +6,7 @@ ENV HOME="/" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/java/bin:/opt/bitnami/zookeeper/bin:$PATH"
 
 COPY prebuildfs /
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libc6 netcat procps tar zlib1g
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.3-150" --checksum 1013e2ebbe58e5dc8f3c79fc952f020fc5306ba48463803cacfbed7779173924
diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md
index 314d68bdb788..ef149758d5d7 100644
--- a/bitnami/zookeeper/README.md
+++ b/bitnami/zookeeper/README.md
@@ -52,7 +52,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`3.8`, `3.8-debian-11`, `3.8.0`, `3.8.0-debian-11-r8`, `latest` (3.8/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.8.0-debian-11-r8/3.8/debian-11/Dockerfile)
 * [`3.7`, `3.7-debian-11`, `3.7.1`, `3.7.1-debian-11-r7` (3.7/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.7.1-debian-11-r7/3.7/debian-11/Dockerfile)
-* [`3.6`, `3.6-debian-11`, `3.6.3`, `3.6.3-debian-11-r7` (3.6/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.6.3-debian-11-r7/3.6/debian-11/Dockerfile)
+* [`3.6`, `3.6-debian-11`, `3.6.3`, `3.6.3-debian-11-r8` (3.6/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.6.3-debian-11-r8/3.6/debian-11/Dockerfile)
 * [`3.5`, `3.5-debian-11`, `3.5.10`, `3.5.10-debian-11-r7` (3.5/debian-11/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.5.10-debian-11-r7/3.5/debian-11/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/zookeeper GitHub repo](https://github.com/bitnami/bitnami-docker-zookeeper).