diff --git a/bitnami/cassandra/4.0/debian-10/Dockerfile b/bitnami/cassandra/4.0/debian-10/Dockerfile
index a5eef5e19577..7772b9004ed2 100644
--- a/bitnami/cassandra/4.0/debian-10/Dockerfile
+++ b/bitnami/cassandra/4.0/debian-10/Dockerfile
@@ -26,7 +26,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/cassandra/postunpack.sh
 RUN /opt/bitnami/scripts/java/postunpack.sh
 ENV BITNAMI_APP_NAME="cassandra" \
-    BITNAMI_IMAGE_VERSION="4.0.1-debian-10-r138" \
+    BITNAMI_IMAGE_VERSION="4.0.1-debian-10-r139" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/python/bin:/opt/bitnami/java/bin:/opt/bitnami/common/bin:/opt/bitnami/cassandra/bin:$PATH"
 
diff --git a/bitnami/cassandra/4.0/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/cassandra/4.0/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
index 94abe7e64562..e3098a93b7c0 100644
--- a/bitnami/cassandra/4.0/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ b/bitnami/cassandra/4.0/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/cassandra/README.md b/bitnami/cassandra/README.md
index d8d60f247e95..e2a09b3301e5 100644
--- a/bitnami/cassandra/README.md
+++ b/bitnami/cassandra/README.md
@@ -50,7 +50,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy
 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/).
 
 
-* [`4.0`, `4.0-debian-10`, `4.0.1`, `4.0.1-debian-10-r138`, `latest` (4.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-cassandra/blob/4.0.1-debian-10-r138/4.0/debian-10/Dockerfile)
+* [`4.0`, `4.0-debian-10`, `4.0.1`, `4.0.1-debian-10-r139`, `latest` (4.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-cassandra/blob/4.0.1-debian-10-r139/4.0/debian-10/Dockerfile)
 * [`3.11`, `3.11-debian-10`, `3.11.11`, `3.11.11-debian-10-r173` (3.11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-cassandra/blob/3.11.11-debian-10-r173/3.11/debian-10/Dockerfile)
 * [`3.0`, `3.0-debian-10`, `3.0.25`, `3.0.25-debian-10-r113` (3.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-cassandra/blob/3.0.25-debian-10-r113/3.0/debian-10/Dockerfile)