diff --git a/bitnami/geode/1/debian-10/Dockerfile b/bitnami/geode/1/debian-10/Dockerfile
index ff7aaca482b1..1cc10f945fa3 100644
--- a/bitnami/geode/1/debian-10/Dockerfile
+++ b/bitnami/geode/1/debian-10/Dockerfile
@@ -22,7 +22,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/geode/postunpack.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
 ENV BITNAMI_APP_NAME="geode" \
-    BITNAMI_IMAGE_VERSION="1.14.3-debian-10-r5" \
+    BITNAMI_IMAGE_VERSION="1.14.3-debian-10-r6" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/geode/bin:$PATH"
 
diff --git a/bitnami/geode/1/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/geode/1/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
index 94abe7e64562..e3098a93b7c0 100644
--- a/bitnami/geode/1/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ b/bitnami/geode/1/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
@@ -60,6 +60,6 @@ component_unpack() {
         echo "Verifying package integrity"
         echo "$package_sha256  ${base_name}.tar.gz" | sha256sum --check - || exit "$?"
     fi
-    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 "${base_name}/files/"
+    tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2
     rm "${base_name}.tar.gz"
 }
diff --git a/bitnami/geode/README.md b/bitnami/geode/README.md
index 4608817b3e74..bd0238bfab66 100644
--- a/bitnami/geode/README.md
+++ b/bitnami/geode/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/).
 
 
-* [`1`, `1-debian-10`, `1.14.3`, `1.14.3-debian-10-r5`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-geode/blob/1.14.3-debian-10-r5/1/debian-10/Dockerfile)
+* [`1`, `1-debian-10`, `1.14.3`, `1.14.3-debian-10-r6`, `latest` (1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-geode/blob/1.14.3-debian-10-r6/1/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/geode GitHub repo](https://github.com/bitnami/bitnami-docker-geode).