diff --git a/WORKSPACE b/WORKSPACE
index 6c0e11560a8..e03499f68b0 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,8 +15,8 @@ workspace(name = "tf_serving")
 load("//tensorflow_serving:repo.bzl", "tensorflow_http_archive")
 tensorflow_http_archive(
     name = "org_tensorflow",
-    sha256 = "d08bea09b8804d4f6a995ba5e98062faaf361b34a2051ca5f8a5d8090c339c97",
-    git_commit = "92a51d52ad199319e4f9de83fcbe970151dfed7e",
+    sha256 = "2f44f6b57e065a545d16a64a428d91ec2006def421a6ea44940e159048f15f0c",
+    git_commit = "1b8f5c396f0c016ebe81fe1af029e6f205c926a4",
 )
 
 # Import all of TensorFlow Serving's external dependencies.
diff --git a/tensorflow_serving/model_servers/BUILD b/tensorflow_serving/model_servers/BUILD
index 105f86a1e9c..ab6c138cfe5 100644
--- a/tensorflow_serving/model_servers/BUILD
+++ b/tensorflow_serving/model_servers/BUILD
@@ -490,7 +490,7 @@ pkg_deb(
     homepage = "https://github.com/tensorflow/serving",
     maintainer = "TensorFlow Serving team",
     package = "tensorflow-model-server",
-    version = "2.8.3",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
+    version = "2.8.4",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
 )
 
 # Build with '-c opt'
@@ -501,5 +501,5 @@ pkg_deb(
     homepage = "https://github.com/tensorflow/serving",
     maintainer = "TensorFlow Serving team",
     package = "tensorflow-model-server-universal",
-    version = "2.8.3",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
+    version = "2.8.4",  # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
 )
diff --git a/tensorflow_serving/model_servers/version.h b/tensorflow_serving/model_servers/version.h
index 8ca3380ecfe..96ccc0ede28 100644
--- a/tensorflow_serving/model_servers/version.h
+++ b/tensorflow_serving/model_servers/version.h
@@ -24,7 +24,7 @@ limitations under the License.
 
 #define TF_MODELSERVER_MAJOR_VERSION 2
 #define TF_MODELSERVER_MINOR_VERSION 8
-#define TF_MODELSERVER_PATCH_VERSION 3
+#define TF_MODELSERVER_PATCH_VERSION 4
 // TF_MODELSERVER_VERSION_SUFFIX is non-empty for pre-releases
 // (e.g. "-alpha", "-alpha.1", "-beta", "-rc", "-rc.1")
 #define TF_MODELSERVER_VERSION_SUFFIX "-rc1"
diff --git a/tensorflow_serving/tools/pip_package/setup.py b/tensorflow_serving/tools/pip_package/setup.py
index cec234fd4f3..bd2993d22a0 100644
--- a/tensorflow_serving/tools/pip_package/setup.py
+++ b/tensorflow_serving/tools/pip_package/setup.py
@@ -31,9 +31,9 @@
 DOCLINES = __doc__.split('\n')
 
 # Set when releasing a new version of TensorFlow Serving (e.g. 1.0.0).
-_VERSION = '2.8.3'
+_VERSION = '2.8.4'
 # Have this by default be open; releasing a new version will lock to TF version
-_TF_VERSION = '>=2.8.3,<3'
+_TF_VERSION = '>=2.8.4,<3'
 _TF_VERSION_SANITIZED = _TF_VERSION.replace('-', '')
 
 project_name = 'tensorflow-serving-api'