diff --git a/buildkite/pipelines/tensorflow-serving-postsubmit.json b/buildkite/pipelines/tensorflow-serving-postsubmit.json
new file mode 100644
index 0000000..5b58c07
--- /dev/null
+++ b/buildkite/pipelines/tensorflow-serving-postsubmit.json
@@ -0,0 +1,20 @@
+{
+  "platforms": {
+    "ubuntu1404": {
+      "shell_commands": [
+        "(cd tensorflow && ./tensorflow/tools/ci_build/builds/configured CPU)",
+        "echo -e '\nimport %workspace%/tensorflow/.tf_configure.bazelrc' >>bazel.bazelrc",
+        "./tensorflow/tools/ci_build/builds/configured CPU"
+      ],
+      "build_targets": ["tensorflow_serving/..."]
+    },
+    "ubuntu1604": {
+      "shell_commands": [
+        "(cd tensorflow && ./tensorflow/tools/ci_build/builds/configured CPU)",
+        "echo -e '\nimport %workspace%/tensorflow/.tf_configure.bazelrc' >>bazel.bazelrc",
+        "./tensorflow/tools/ci_build/builds/configured CPU"
+      ],
+      "build_targets": ["tensorflow_serving/..."]
+    }
+  }
+}