diff --git a/bitnami/harbor-notary-signer/2/debian-10/Dockerfile b/bitnami/harbor-notary-signer/2/debian-10/Dockerfile
index 464858c9f171..aa460910c090 100644
--- a/bitnami/harbor-notary-signer/2/debian-10/Dockerfile
+++ b/bitnami/harbor-notary-signer/2/debian-10/Dockerfile
@@ -16,7 +16,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/harbor-notary-signer/postunpack.sh
 ENV BITNAMI_APP_NAME="harbor-notary-signer" \
-    BITNAMI_IMAGE_VERSION="2.4.0-debian-10-r39" \
+    BITNAMI_IMAGE_VERSION="2.4.0-debian-10-r40" \
     PATH="/opt/bitnami/harbor-notary-signer/bin:/opt/bitnami/common/bin:$PATH" \
     SERVICE_NAME="notary_signer"
 
diff --git a/bitnami/harbor-notary-signer/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/harbor-notary-signer/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index b438c913341d..1b504b1df458 100644
--- a/bitnami/harbor-notary-signer/2/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/harbor-notary-signer/2/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/harbor-notary-signer/README.md b/bitnami/harbor-notary-signer/README.md
index 512e70a87fc8..49a4b41b9165 100644
--- a/bitnami/harbor-notary-signer/README.md
+++ b/bitnami/harbor-notary-signer/README.md
@@ -43,7 +43,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/).
 
 
-* [`2`, `2-debian-10`, `2.4.0`, `2.4.0-debian-10-r39`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-notary-signer/blob/2.4.0-debian-10-r39/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.4.0`, `2.4.0-debian-10-r40`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-harbor-notary-signer/blob/2.4.0-debian-10-r40/2/debian-10/Dockerfile)
 
 ## Configuration