diff --git a/0/Dockerfile b/0/Dockerfile
index 1ff0eb4d..7cd6b83e 100644
--- a/0/Dockerfile
+++ b/0/Dockerfile
@@ -1,8 +1,6 @@
 FROM bitnami/minideb-extras:jessie-r19
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
-
-
 # Install required system packages and dependencies
 RUN install_packages libc6 libgcc1 libstdc++6
 RUN bitnami-pkg unpack tensorflow-serving-0.6.0-0 --checksum 0b55d1bf8e0ee73ed742d38a5dc1d5bbbe4d17d388a199cd9c7ae5b0d9435380
@@ -10,14 +8,11 @@ RUN bitnami-pkg unpack tensorflow-serving-0.6.0-0 --checksum 0b55d1bf8e0ee73ed74
 COPY rootfs /
 
 ENV BITNAMI_APP_NAME="tensorflow-serving" \
-    BITNAMI_IMAGE_VERSION="0.6.0-r1" \
+    BITNAMI_IMAGE_VERSION="0.6.0-r2" \
     PATH="/opt/bitnami/tensorflow-serving/bin:/opt/bitnami/tensorflow-serving/bazel-bin/tensorflow_serving/model_servers:$PATH" \
     TENSORFLOW_SERVING_MODEL_NAME="inception" \
     TENSORFLOW_SERVING_PORT_NUMBER="9000"
 
-
-
-
 EXPOSE 9000
 
 ENTRYPOINT ["/app-entrypoint.sh"]
diff --git a/0/rootfs/run.sh b/0/rootfs/run.sh
index 15303d79..ac20c6d7 100755
--- a/0/rootfs/run.sh
+++ b/0/rootfs/run.sh
@@ -2,10 +2,8 @@
 . /opt/bitnami/base/functions
 . /opt/bitnami/base/helpers
 
-DAEMON=tensorflow-serving.sh
+TENSORFLOW_SERVING_HOME="/opt/bitnami/tensorflow-serving"
 USER=tensorflow
-EXEC=$(which $DAEMON)
-ARGS="start-foreground"
 
 info "Starting ${DAEMON}..."
-exec gosu ${USER} ${EXEC} ${ARGS}
+exec gosu ${USER} bash -c "${TENSORFLOW_SERVING_HOME}/bin/tensorflow-serving.sh start && tail -f ${TENSORFLOW_SERVING_HOME}/logs/tensorflow-serving.log"