diff --git a/bitnami/tensorflow-serving/2/debian-10/Dockerfile b/bitnami/tensorflow-serving/2/debian-10/Dockerfile
index 4d21b01c59c0..560bb367833a 100644
--- a/bitnami/tensorflow-serving/2/debian-10/Dockerfile
+++ b/bitnami/tensorflow-serving/2/debian-10/Dockerfile
@@ -23,7 +23,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/tensorflow-serving/postunpack.sh
 ENV BITNAMI_APP_NAME="tensorflow-serving" \
-    BITNAMI_IMAGE_VERSION="2.7.0-debian-10-r86" \
+    BITNAMI_IMAGE_VERSION="2.7.0-debian-10-r87" \
     JAVA_HOME="/opt/bitnami/java"
 
 EXPOSE 8500
diff --git a/bitnami/tensorflow-serving/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/tensorflow-serving/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
index 94abe7e64562..e3098a93b7c0 100644
--- a/bitnami/tensorflow-serving/2/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh
+++ b/bitnami/tensorflow-serving/2/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/tensorflow-serving/README.md b/bitnami/tensorflow-serving/README.md
index c23cb5f698a5..a8c2aef6d228 100644
--- a/bitnami/tensorflow-serving/README.md
+++ b/bitnami/tensorflow-serving/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.7.0`, `2.7.0-debian-10-r86`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tensorflow-serving/blob/2.7.0-debian-10-r86/2/debian-10/Dockerfile)
+* [`2`, `2-debian-10`, `2.7.0`, `2.7.0-debian-10-r87`, `latest` (2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-tensorflow-serving/blob/2.7.0-debian-10-r87/2/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/tensorflow-serving GitHub repo](https://github.com/bitnami/bitnami-docker-tensorflow-serving).