diff --git a/bitnami/wavefront-proxy/10/debian-10/Dockerfile b/bitnami/wavefront-proxy/10/debian-10/Dockerfile
index ce97a82f5807..882c2c450c3a 100644
--- a/bitnami/wavefront-proxy/10/debian-10/Dockerfile
+++ b/bitnami/wavefront-proxy/10/debian-10/Dockerfile
@@ -20,7 +20,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/wavefront-proxy/postunpack.sh
 ENV BITNAMI_APP_NAME="wavefront-proxy" \
-    BITNAMI_IMAGE_VERSION="10.9.0-debian-10-r58" \
+    BITNAMI_IMAGE_VERSION="10.9.0-debian-10-r59" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:$PATH"
 
diff --git a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index b438c913341d..1b504b1df458 100644
--- a/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/wavefront-proxy/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -20,8 +20,13 @@
 owned_by() {
     local path="${1:?path is missing}"
     local owner="${2:?owner is missing}"
+    local group="${3:-}"
 
-    chown "$owner":"$owner" "$path"
+    if [[ -n $group ]]; then
+        chown "$owner":"$group" "$path"
+    else
+        chown "$owner":"$owner" "$path"
+    fi
 }
 
 ########################
@@ -34,11 +39,12 @@ owned_by() {
 #########################
 ensure_dir_exists() {
     local dir="${1:?directory is missing}"
-    local owner="${2:-}"
+    local owner_user="${2:-}"
+    local owner_group="${3:-}"
 
     mkdir -p "${dir}"
-    if [[ -n $owner ]]; then
-        owned_by "$dir" "$owner"
+    if [[ -n $owner_user ]]; then
+        owned_by "$dir" "$owner_user" "$owner_group"
     fi
 }
 
diff --git a/bitnami/wavefront-proxy/README.md b/bitnami/wavefront-proxy/README.md
index 907154d44a4f..bceab221ce35 100644
--- a/bitnami/wavefront-proxy/README.md
+++ b/bitnami/wavefront-proxy/README.md
@@ -31,7 +31,7 @@ $ docker run --name wavefront-proxy bitnami/wavefront-proxy:latest
 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/).
 
 
-* [`10`, `10-debian-10`, `10.9.0`, `10.9.0-debian-10-r58`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-proxy/blob/10.9.0-debian-10-r58/10/debian-10/Dockerfile)
+* [`10`, `10-debian-10`, `10.9.0`, `10.9.0-debian-10-r59`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-wavefront-proxy/blob/10.9.0-debian-10-r59/10/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/wavefront-proxy GitHub repo](https://github.com/bitnami/bitnami-docker-wavefront-proxy).