diff --git a/bitnami/tensorflow-serving/2/debian-12/Dockerfile b/bitnami/tensorflow-serving/2/debian-12/Dockerfile
index 9a15a7fd6b7b..27afb1af8a21 100644
--- a/bitnami/tensorflow-serving/2/debian-12/Dockerfile
+++ b/bitnami/tensorflow-serving/2/debian-12/Dockerfile
@@ -9,11 +9,11 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-11-10T00:11:29Z" \
+      org.opencontainers.image.created="2024-12-10T00:46:23Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/tensorflow-serving/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="2.18.0-debian-12-r1" \
+      org.opencontainers.image.ref.name="2.18.0-debian-12-r2" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/tensorflow-serving" \
       org.opencontainers.image.title="tensorflow-serving" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -31,7 +31,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl gcc-11 libgcc-s1 libstdc++6 procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "render-template-1.0.7-7-linux-${OS_ARCH}-debian-12" \
+      "render-template-1.0.7-8-linux-${OS_ARCH}-debian-12" \
       "tensorflow-serving-2.18.0-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/tensorflow-serving/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/tensorflow-serving/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index f09fc4869697..0fc403b9994f 100644
--- a/bitnami/tensorflow-serving/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/tensorflow-serving/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.7-7"
+        "version": "1.0.7-8"
     },
     "tensorflow-serving": {
         "arch": "amd64",
diff --git a/bitnami/tensorflow-serving/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh b/bitnami/tensorflow-serving/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
index 8557631d2549..38802fc0bfe9 100755
--- a/bitnami/tensorflow-serving/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
+++ b/bitnami/tensorflow-serving/2/debian-12/rootfs/opt/bitnami/scripts/java/entrypoint.sh
@@ -13,6 +13,11 @@ set -o pipefail
 . /opt/bitnami/scripts/libbitnami.sh
 . /opt/bitnami/scripts/liblog.sh
 
+if [[ "$OS_FLAVOUR" =~ photon && "$APP_VERSION" =~ ^1.8 ]]; then
+  # Option --module-path is not supported by JAVA 1.8 since modules were added in version 1.9
+  unset JAVA_TOOL_OPTIONS
+fi
+
 print_welcome_page
 
 echo ""
diff --git a/bitnami/tensorflow-serving/README.md b/bitnami/tensorflow-serving/README.md
index 751925156145..0d986df28e29 100644
--- a/bitnami/tensorflow-serving/README.md
+++ b/bitnami/tensorflow-serving/README.md
@@ -28,11 +28,11 @@ Looking to use TensorFlow Serving in production? Try [VMware Tanzu Application C
 
 ## Why use a non-root container?
 
-Non-root container images add an extra layer of security and are generally recommended for production environments. However, because they run as a non-root user, privileged tasks are typically off-limits. Learn more about non-root containers [in our docs](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-work-with-non-root-containers-index.html).
+Non-root container images add an extra layer of security and are generally recommended for production environments. However, because they run as a non-root user, privileged tasks are typically off-limits. Learn more about non-root containers [in our docs](https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-work-with-non-root-containers-index.html).
 
 ## Supported tags and respective `Dockerfile` links
 
-Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html).
+Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-understand-rolling-tags-containers-index.html).
 
 You can see the equivalence between the different tags by taking a look at the `tags-info.yaml` file present in the branch folder, i.e `bitnami/ASSET/BRANCH/DISTRO/tags-info.yaml`.