diff --git a/bitnami/tensorflow-serving/2/ol-7/Dockerfile b/bitnami/tensorflow-serving/2/ol-7/Dockerfile
new file mode 100644
index 000000000000..eb323e40d87c
--- /dev/null
+++ b/bitnami/tensorflow-serving/2/ol-7/Dockerfile
@@ -0,0 +1,26 @@
+FROM bitnami/oraclelinux-extras:7-r527
+LABEL maintainer "Bitnami <containers@bitnami.com>"
+
+ENV BITNAMI_PKG_CHMOD="-R g+rwX" \
+    HOME="/"
+
+# Install required system packages and dependencies
+RUN install_packages glibc libgcc libstdc++
+RUN bitnami-pkg unpack tensorflow-serving-2.0.0-0 --checksum 8e5efddeb6d3b4e15d5094c0a9014955c3e7ec17f21f861f6e2eace1b16fc922
+
+COPY rootfs /
+ENV BITNAMI_APP_NAME="tensorflow-serving" \
+    BITNAMI_IMAGE_VERSION="2.0.0-ol-7-r0" \
+    NAMI_PREFIX="/.nami" \
+    PATH="/opt/bitnami/tensorflow-serving/bin:/opt/bitnami/tensorflow-serving/bazel-bin/tensorflow_serving/model_servers:$PATH" \
+    TENSORFLOW_SERVING_ENABLE_MONITORING="no" \
+    TENSORFLOW_SERVING_MODEL_NAME="resnet" \
+    TENSORFLOW_SERVING_MONITORING_PATH="/monitoring/prometheus/metrics" \
+    TENSORFLOW_SERVING_PORT_NUMBER="8500" \
+    TENSORFLOW_SERVING_REST_API_PORT_NUMBER="8501"
+
+EXPOSE 8500
+
+USER 1001
+ENTRYPOINT [ "/app-entrypoint.sh" ]
+CMD [ "/run.sh" ]
diff --git a/bitnami/tensorflow-serving/2/ol-7/docker-compose.yml b/bitnami/tensorflow-serving/2/ol-7/docker-compose.yml
new file mode 100644
index 000000000000..be4f6a93e1fd
--- /dev/null
+++ b/bitnami/tensorflow-serving/2/ol-7/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '2'
+
+services:
+  tensorflow-serving:
+    image: 'bitnami/tensorflow-serving:2-ol-7'
+    ports:
+      - '8500:8500'
+      - '8501:8501'
+    volumes:
+      - 'tensorflow_serving_data:/bitnami'
+      - '/tmp/model-data:/bitnami/model-data'
+volumes:
+  tensorflow_serving_data:
+    driver: local
diff --git a/bitnami/tensorflow-serving/2/ol-7/rootfs/app-entrypoint.sh b/bitnami/tensorflow-serving/2/ol-7/rootfs/app-entrypoint.sh
new file mode 100755
index 000000000000..42d922646329
--- /dev/null
+++ b/bitnami/tensorflow-serving/2/ol-7/rootfs/app-entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+print_welcome_page
+
+if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/run.sh" ]]; then
+    nami_initialize tensorflow-serving
+    info "Starting tensorflow-serving... "
+fi
+
+exec tini -- "$@"
diff --git a/bitnami/tensorflow-serving/2/ol-7/rootfs/run.sh b/bitnami/tensorflow-serving/2/ol-7/rootfs/run.sh
new file mode 100755
index 000000000000..73e1e827df96
--- /dev/null
+++ b/bitnami/tensorflow-serving/2/ol-7/rootfs/run.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+. /opt/bitnami/base/functions
+. /opt/bitnami/base/helpers
+
+DAEMON="tensorflow-serving.sh"
+USER=tensorflow
+EXEC=$(which $DAEMON)
+START_COMMAND="${EXEC} start-foreground"
+
+# If container is started as `root` user
+if [ $EUID -eq 0 ]; then
+    exec gosu "${USER}" bash -c "${START_COMMAND}"
+else
+    exec bash -c "${START_COMMAND}"
+fi
diff --git a/bitnami/tensorflow-serving/2/ol-7/rootfs/tensorflow-serving-inputs.json b/bitnami/tensorflow-serving/2/ol-7/rootfs/tensorflow-serving-inputs.json
new file mode 100644
index 000000000000..256b28eadab0
--- /dev/null
+++ b/bitnami/tensorflow-serving/2/ol-7/rootfs/tensorflow-serving-inputs.json
@@ -0,0 +1,7 @@
+{
+  "enableMonitoring": "{{$global.env.TENSORFLOW_SERVING_ENABLE_MONITORING}}",
+  "modelName": "{{$global.env.TENSORFLOW_SERVING_MODEL_NAME}}",
+  "monitoringPath": "{{$global.env.TENSORFLOW_SERVING_MONITORING_PATH}}",
+  "port": "{{$global.env.TENSORFLOW_SERVING_PORT_NUMBER}}",
+  "restApiPort": "{{$global.env.TENSORFLOW_SERVING_REST_API_PORT_NUMBER}}"
+}
\ No newline at end of file
diff --git a/bitnami/tensorflow-serving/README.md b/bitnami/tensorflow-serving/README.md
index fb42085832ff..34f67c733e9b 100644
--- a/bitnami/tensorflow-serving/README.md
+++ b/bitnami/tensorflow-serving/README.md
@@ -43,8 +43,8 @@ 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/containers/how-to/understand-rolling-tags-containers/).
 
 
-* [`1-ol-7`, `1.14.0-ol-7-r127` (1/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-tensorflow-serving/blob/1.14.0-ol-7-r127/1/ol-7/Dockerfile)
-* [`1-debian-9`, `1.14.0-debian-9-r119`, `1`, `1.14.0`, `1.14.0-r119`, `latest` (1/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-tensorflow-serving/blob/1.14.0-debian-9-r119/1/debian-9/Dockerfile)
+* [`2-ol-7`, `2.0.0-ol-7-r0` (2/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-tensorflow-serving/blob/2.0.0-ol-7-r0/2/ol-7/Dockerfile)
+* [`2-debian-9`, `0.0.0-debian-9-r0`, `2`, `0.0.0`, `0.0.0-r0`, `latest` (2/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-tensorflow-serving/blob/0.0.0-debian-9-r0/2/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/tensorflow-serving GitHub repo](https://github.com/bitnami/bitnami-docker-tensorflow-serving).
 
@@ -65,7 +65,7 @@ $ docker pull bitnami/tensorflow-serving:[TAG]
 If you wish, you can also build the image yourself.
 
 ```bash
-$ docker build -t bitnami/tensorflow-serving:latest 'https://github.com/bitnami/bitnami-docker-tensorflow-serving.git#master:1/debian-9'
+$ docker build -t bitnami/tensorflow-serving:latest 'https://github.com/bitnami/bitnami-docker-tensorflow-serving.git#master:2/debian-9'
 ```
 
 # Persisting your configuration