diff --git a/WORKSPACE b/WORKSPACE
index 8b8317a55ed..830178050f8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -11,8 +11,8 @@ load("//tensorflow_serving:repo.bzl", "tensorflow_http_archive")
 
 tensorflow_http_archive(
     name = "org_tensorflow",
-    sha256 = "788bb65c12a79fd02746d614bd87485738d9e4c1aed79fde52ffea434e1c1050",
-    git_commit = "553bff39bbec23e0d7b792fd8b4383014ad0401f",
+    sha256 = "1c5151923bbd10fb14311f1a0102de84ca3c29eafe2ef52f7ef07cb38f4acf36",
+    git_commit = "083fc9754e64b9ebb7970dc49a9d13d1a72413cf",
 )
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel b/tensorflow_serving/tools/docker/Dockerfile.devel
index 9061c424517..d771229bf3d 100644
--- a/tensorflow_serving/tools/docker/Dockerfile.devel
+++ b/tensorflow_serving/tools/docker/Dockerfile.devel
@@ -64,7 +64,7 @@ RUN pip3 --no-cache-dir install \
     --ignore-installed six
 
 # Set up Bazel
-ENV BAZEL_VERSION 1.2.1
+ENV BAZEL_VERSION 2.0.0
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \
diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu
index 5ee1d380061..c78927bf897 100644
--- a/tensorflow_serving/tools/docker/Dockerfile.devel-gpu
+++ b/tensorflow_serving/tools/docker/Dockerfile.devel-gpu
@@ -94,7 +94,7 @@ RUN pip3 --no-cache-dir install \
      --ignore-installed six
 
 # Set up Bazel
-ENV BAZEL_VERSION 1.2.1
+ENV BAZEL_VERSION 2.0.0
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \
diff --git a/tensorflow_serving/tools/docker/Dockerfile.devel-mkl b/tensorflow_serving/tools/docker/Dockerfile.devel-mkl
index f3044ae3ad6..997bc1f4d80 100644
--- a/tensorflow_serving/tools/docker/Dockerfile.devel-mkl
+++ b/tensorflow_serving/tools/docker/Dockerfile.devel-mkl
@@ -63,7 +63,7 @@ RUN pip3 --no-cache-dir install \
     --ignore-installed six
 
 # Set up Bazel
-ENV BAZEL_VERSION 1.2.1
+ENV BAZEL_VERSION 2.0.0
 WORKDIR /
 RUN mkdir /bazel && \
     cd /bazel && \