diff --git a/bitnami/zookeeper/3.5/debian-10/Dockerfile b/bitnami/zookeeper/3.5/debian-10/Dockerfile
index e03a6a52a26c..0a868c12c236 100644
--- a/bitnami/zookeeper/3.5/debian-10/Dockerfile
+++ b/bitnami/zookeeper/3.5/debian-10/Dockerfile
@@ -10,7 +10,7 @@ ENV HOME="/" \
 COPY prebuildfs /
 # 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.0-3" --checksum 7521d9a4f9e4e182bf32977e234026caa7b03759799868335bccb1edd8f8fd12
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "wait-for-port" "1.0.1-1" --checksum 28dc75dff64df07e67b711d20859c24ebc996db0eaac06138553341d0f769299
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "java" "11.0.13-0" --checksum 9552e53ccd3b0ec85a82c31c26a1462260e28b7c58770a5c53560afb02ec66d9
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-0" --checksum 3e6fc37ca073b10a73a804d39c2f0c028947a1a596382a4f8ebe43dfbaa3a25e
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "zookeeper" "3.5.9-0" --checksum 72119e53300c2d088f47920dc5f26261f265cd5e1bfac9d432bcb1ed3ea54efa
@@ -21,7 +21,7 @@ RUN ln -s /opt/bitnami/scripts/zookeeper/run.sh /run.sh
 COPY rootfs /
 RUN /opt/bitnami/scripts/zookeeper/postunpack.sh
 ENV BITNAMI_APP_NAME="zookeeper" \
-    BITNAMI_IMAGE_VERSION="3.5.9-debian-10-r31"
+    BITNAMI_IMAGE_VERSION="3.5.9-debian-10-r32"
 
 EXPOSE 2181 2888 3888 8080
 
diff --git a/bitnami/zookeeper/3.5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/zookeeper/3.5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index 0ebfefcda279..53733ea44be8 100644
--- a/bitnami/zookeeper/3.5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/zookeeper/3.5/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,10 +15,10 @@
     },
     "wait-for-port": {
         "arch": "amd64",
-        "digest": "7521d9a4f9e4e182bf32977e234026caa7b03759799868335bccb1edd8f8fd12",
+        "digest": "28dc75dff64df07e67b711d20859c24ebc996db0eaac06138553341d0f769299",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "1.0.0-3"
+        "version": "1.0.1-1"
     },
     "zookeeper": {
         "arch": "amd64",
diff --git a/bitnami/zookeeper/3.5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/zookeeper/3.5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index ae5e2459c377..b438c913341d 100644
--- a/bitnami/zookeeper/3.5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/zookeeper/3.5/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -50,8 +50,9 @@ ensure_dir_exists() {
 #   boolean
 #########################
 is_dir_empty() {
-    local dir="${1:?missing directory}"
-
+    local -r path="${1:?missing directory}"
+    # Calculate real path in order to avoid issues with symlinks
+    local -r dir="$(realpath "$path")"
     if [[ ! -e "$dir" ]] || [[ -z "$(ls -A "$dir")" ]]; then
         true
     else
@@ -88,7 +89,7 @@ is_file_writable() {
     local dir
     dir="$(dirname "$file")"
 
-    if [[ ( -f "$file" && -w "$file" ) || ( ! -f "$file" && -d "$dir" && -w "$dir" ) ]]; then
+    if [[ (-f "$file" && -w "$file") || (! -f "$file" && -d "$dir" && -w "$dir") ]]; then
         true
     else
         false
@@ -136,31 +137,31 @@ configure_permissions_ownership() {
     shift 1
     while [ "$#" -gt 0 ]; do
         case "$1" in
-            -f|--file-mode)
-                shift
-                file_mode="${1:?missing mode for files}"
-                ;;
-            -d|--dir-mode)
-                shift
-                dir_mode="${1:?missing mode for directories}"
-                ;;
-            -u|--user)
-                shift
-                user="${1:?missing user}"
-                ;;
-            -g|--group)
-                shift
-                group="${1:?missing group}"
-                ;;
-            *)
-                echo "Invalid command line flag $1" >&2
-                return 1
-                ;;
+        -f | --file-mode)
+            shift
+            file_mode="${1:?missing mode for files}"
+            ;;
+        -d | --dir-mode)
+            shift
+            dir_mode="${1:?missing mode for directories}"
+            ;;
+        -u | --user)
+            shift
+            user="${1:?missing user}"
+            ;;
+        -g | --group)
+            shift
+            group="${1:?missing group}"
+            ;;
+        *)
+            echo "Invalid command line flag $1" >&2
+            return 1
+            ;;
         esac
         shift
     done
 
-    read -r -a filepaths <<< "$paths"
+    read -r -a filepaths <<<"$paths"
     for p in "${filepaths[@]}"; do
         if [[ -e "$p" ]]; then
             if [[ -n $dir_mode ]]; then
diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md
index ee20eeece419..439ea8045f01 100644
--- a/bitnami/zookeeper/README.md
+++ b/bitnami/zookeeper/README.md
@@ -51,7 +51,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`3.7`, `3.7-debian-10`, `3.7.0`, `3.7.0-debian-10-r194`, `latest` (3.7/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.7.0-debian-10-r194/3.7/debian-10/Dockerfile)
 * [`3.6`, `3.6-debian-10`, `3.6.3`, `3.6.3-debian-10-r149` (3.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.6.3-debian-10-r149/3.6/debian-10/Dockerfile)
-* [`3.5`, `3.5-debian-10`, `3.5.9`, `3.5.9-debian-10-r31` (3.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.5.9-debian-10-r31/3.5/debian-10/Dockerfile)
+* [`3.5`, `3.5-debian-10`, `3.5.9`, `3.5.9-debian-10-r32` (3.5/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-zookeeper/blob/3.5.9-debian-10-r32/3.5/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/zookeeper GitHub repo](https://github.com/bitnami/bitnami-docker-zookeeper).