diff --git a/bitnami/elasticsearch/8/debian-11/Dockerfile b/bitnami/elasticsearch/8/debian-11/Dockerfile
index 266b7e3da58b..bae25eca2a96 100644
--- a/bitnami/elasticsearch/8/debian-11/Dockerfile
+++ b/bitnami/elasticsearch/8/debian-11/Dockerfile
@@ -1,3 +1,6 @@
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 FROM docker.io/bitnami/minideb:bullseye
 
 ARG ELASTICSEARCH_PLUGINS
@@ -5,10 +8,10 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-06-20T15:20:37Z" \
+      org.opencontainers.image.created="2023-06-23T17:49:41Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="8.8.1-debian-11-r4" \
+      org.opencontainers.image.ref.name="8.8.1-debian-11-r5" \
       org.opencontainers.image.title="elasticsearch" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="8.8.1"
diff --git a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
index 801b9412bd99..eb52f7644785 100644
--- a/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/elasticsearch/8/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -42,7 +42,7 @@ ensure_dir_exists() {
     local owner_user="${2:-}"
     local owner_group="${3:-}"
 
-    mkdir -p "${dir}"
+    [ -d "${dir}" ] || mkdir -p "${dir}"
     if [[ -n $owner_user ]]; then
         owned_by "$dir" "$owner_user" "$owner_group"
     fi