diff --git a/BUILD.bazel b/BUILD.bazel
index 308fa316d..219dd4c9c 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1,11 +1,8 @@
 # Bazel build
 # C/C++ documentation: https://docs.bazel.build/versions/master/be/c-cpp.html
 
-load("@rules_proto//proto:defs.bzl", "proto_library")
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_proto_library", "cc_test")
 load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("@com_github_grpc_grpc//bazel:cython_library.bzl", "pyx_library")
-load("@rules_proto_grpc//python:defs.bzl", "python_grpc_compile")
 load("@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_cc_library")
 load("//bazel:ray.bzl", "COPTS", "PYX_COPTS", "PYX_SRCS", "copy_to_workspace")
 
@@ -24,125 +21,6 @@ config_setting(
     values = {"compilation_mode": "opt"},
 )
 
-# === Begin of protobuf definitions ===
-
-proto_library(
-    name = "common_proto",
-    srcs = ["src/ray/protobuf/common.proto"],
-    visibility = ["//java:__subpackages__"],
-)
-
-cc_proto_library(
-    name = "common_cc_proto",
-    deps = [":common_proto"],
-)
-
-python_grpc_compile(
-    name = "common_py_proto",
-    deps = [":common_proto"],
-)
-
-proto_library(
-    name = "gcs_proto",
-    srcs = ["src/ray/protobuf/gcs.proto"],
-    visibility = ["//java:__subpackages__"],
-    deps = [":common_proto"],
-)
-
-cc_proto_library(
-    name = "gcs_cc_proto",
-    deps = [":gcs_proto"],
-)
-
-python_grpc_compile(
-    name = "gcs_py_proto",
-    deps = [":gcs_proto"],
-)
-
-proto_library(
-    name = "node_manager_proto",
-    srcs = ["src/ray/protobuf/node_manager.proto"],
-    deps = [":common_proto"],
-)
-
-cc_proto_library(
-    name = "node_manager_cc_proto",
-    deps = [":node_manager_proto"],
-)
-
-python_grpc_compile(
-    name = "node_manager_py_proto",
-    deps = [":node_manager_proto"],
-)
-
-proto_library(
-    name = "reporter_proto",
-    srcs = ["src/ray/protobuf/reporter.proto"],
-    deps = [":common_proto"],
-)
-
-cc_proto_library(
-    name = "reporter_cc_proto",
-    deps = [":reporter_proto"],
-)
-
-python_grpc_compile(
-    name = "reporter_py_proto",
-    deps = [":reporter_proto"],
-)
-
-proto_library(
-    name = "gcs_service_proto",
-    srcs = ["src/ray/protobuf/gcs_service.proto"],
-    deps = [
-        ":common_proto",
-        ":gcs_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "gcs_service_cc_proto",
-    deps = [":gcs_service_proto"],
-)
-
-proto_library(
-    name = "object_manager_proto",
-    srcs = ["src/ray/protobuf/object_manager.proto"],
-)
-
-cc_proto_library(
-    name = "object_manager_cc_proto",
-    deps = [":object_manager_proto"],
-)
-
-proto_library(
-    name = "core_worker_proto",
-    srcs = ["src/ray/protobuf/core_worker.proto"],
-    deps = [":common_proto"],
-)
-
-python_grpc_compile(
-    name = "core_worker_py_proto",
-    deps = [":core_worker_proto"],
-)
-
-cc_proto_library(
-    name = "worker_cc_proto",
-    deps = ["core_worker_proto"],
-)
-
-proto_library(
-    name = "serialization_proto",
-    srcs = ["src/ray/protobuf/serialization.proto"],
-)
-
-cc_proto_library(
-    name = "serialization_cc_proto",
-    deps = ["serialization_proto"],
-)
-
-# === End of protobuf definitions ===
-
 # === Begin of rpc definitions ===
 
 # GRPC common lib.
@@ -167,9 +45,9 @@ cc_library(
 # Node manager gRPC lib.
 cc_grpc_library(
     name = "node_manager_cc_grpc",
-    srcs = [":node_manager_proto"],
+    srcs = ["//src/ray/protobuf:node_manager_proto"],
     grpc_only = True,
-    deps = [":node_manager_cc_proto"],
+    deps = ["//src/ray/protobuf:node_manager_cc_proto"],
 )
 
 # Node manager server and client.
@@ -192,9 +70,9 @@ cc_library(
 # gcs_service gRPC lib.
 cc_grpc_library(
     name = "gcs_service_cc_grpc",
-    srcs = [":gcs_service_proto"],
+    srcs = ["//src/ray/protobuf:gcs_service_proto"],
     grpc_only = True,
-    deps = [":gcs_service_cc_proto"],
+    deps = ["//src/ray/protobuf:gcs_service_cc_proto"],
 )
 
 # gcs rpc server and client.
@@ -218,9 +96,9 @@ cc_library(
 # Object manager gRPC lib.
 cc_grpc_library(
     name = "object_manager_cc_grpc",
-    srcs = [":object_manager_proto"],
+    srcs = ["//src/ray/protobuf:object_manager_proto"],
     grpc_only = True,
-    deps = [":object_manager_cc_proto"],
+    deps = ["//src/ray/protobuf:object_manager_cc_proto"],
 )
 
 # Object manager rpc server and client.
@@ -243,9 +121,9 @@ cc_library(
 # Worker gRPC lib.
 cc_grpc_library(
     name = "worker_cc_grpc",
-    srcs = [":core_worker_proto"],
+    srcs = ["//src/ray/protobuf:core_worker_proto"],
     grpc_only = True,
-    deps = [":worker_cc_proto"],
+    deps = ["//src/ray/protobuf:worker_cc_proto"],
 )
 
 # worker server and client.
@@ -269,9 +147,9 @@ cc_library(
 # Metrics Agent gRPC lib.
 cc_grpc_library(
     name = "reporter_cc_grpc",
-    srcs = [":reporter_proto"],
+    srcs = ["//src/ray/protobuf:reporter_proto"],
     grpc_only = True,
-    deps = [":reporter_cc_proto"],
+    deps = ["//src/ray/protobuf:reporter_cc_proto"],
 )
 
 # Metrics Agent client.
@@ -444,10 +322,10 @@ cc_library(
     strip_include_prefix = "src",
     visibility = ["//visibility:public"],
     deps = [
-        ":common_cc_proto",
-        ":gcs_cc_proto",
         ":node_manager_fbs",
         ":ray_util",
+        "//src/ray/protobuf:common_cc_proto",
+        "//src/ray/protobuf:gcs_cc_proto",
         "@arrow",
         "@boost//:asio",
         "@com_github_grpc_grpc//:grpc++",
@@ -622,7 +500,6 @@ cc_library(
     strip_include_prefix = "src",
     visibility = ["//streaming:__subpackages__"],
     deps = [
-        ":common_cc_proto",
         ":gcs",
         ":node_manager_fbs",
         ":node_manager_rpc",
@@ -633,6 +510,7 @@ cc_library(
         ":service_based_gcs_client_lib",
         ":stats_lib",
         ":worker_rpc",
+        "//src/ray/protobuf:common_cc_proto",
         "@boost//:asio",
         "@com_github_jupp0r_prometheus_cpp//pull",
         "@com_google_absl//absl/base:core_headers",
@@ -665,11 +543,11 @@ cc_library(
     strip_include_prefix = "src",
     visibility = ["//streaming:__subpackages__"],
     deps = [
-        ":gcs_cc_proto",
         ":node_manager_fbs",
         ":node_manager_rpc",
         ":ray_common",
         ":ray_util",
+        "//src/ray/protobuf:gcs_cc_proto",
         "@boost//:asio",
     ],
 )
@@ -706,8 +584,8 @@ cc_library(
         ":raylet_client_lib",
         ":service_based_gcs_client_lib",
         ":stats_lib",
-        ":worker_cc_proto",
         ":worker_rpc",
+        "//src/ray/protobuf:worker_cc_proto",
         "@boost//:fiber",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/container:flat_hash_set",
@@ -1582,13 +1460,13 @@ cc_library(
     copts = COPTS,
     strip_include_prefix = "src",
     deps = [
-        ":gcs_cc_proto",
         ":hiredis",
         ":node_manager_fbs",
         ":node_manager_rpc",
         ":ray_common",
         ":ray_util",
         ":stats_lib",
+        "//src/ray/protobuf:gcs_cc_proto",
         "@boost//:asio",
     ],
 )
@@ -1787,10 +1665,10 @@ pyx_library(
         "//:global_state_accessor_lib",
         "//:ray_util",
         "//:raylet_lib",
-        "//:serialization_cc_proto",
         "//:src/ray/ray_exported_symbols.lds",
         "//:src/ray/ray_version_script.lds",
         "//:stats_lib",
+        "//src/ray/protobuf:serialization_cc_proto",
     ],
 )
 
@@ -1912,20 +1790,20 @@ cc_binary(
     linkstatic = 1,
     visibility = ["//java:__subpackages__"],
     deps = [
-        ":gcs_cc_proto",
         ":ray_common",
         ":ray_redis_module",
+        "//src/ray/protobuf:gcs_cc_proto",
     ],
 )
 
 filegroup(
     name = "all_py_proto",
     srcs = [
-        "common_py_proto",
-        "core_worker_py_proto",
-        "gcs_py_proto",
-        "node_manager_py_proto",
-        "reporter_py_proto",
+        "//src/ray/protobuf:common_py_proto",
+        "//src/ray/protobuf:core_worker_py_proto",
+        "//src/ray/protobuf:gcs_py_proto",
+        "//src/ray/protobuf:node_manager_py_proto",
+        "//src/ray/protobuf:reporter_py_proto",
     ],
 )
 
diff --git a/java/BUILD.bazel b/java/BUILD.bazel
index c828a690f..b8691c1d6 100644
--- a/java/BUILD.bazel
+++ b/java/BUILD.bazel
@@ -128,12 +128,12 @@ java_binary(
 
 java_proto_compile(
     name = "common_java_proto",
-    deps = ["@//:common_proto"],
+    deps = ["@//src/ray/protobuf:common_proto"],
 )
 
 java_proto_compile(
     name = "gcs_java_proto",
-    deps = ["@//:gcs_proto"],
+    deps = ["@//src/ray/protobuf:gcs_proto"],
 )
 
 filegroup(
diff --git a/src/ray/protobuf/BUILD b/src/ray/protobuf/BUILD
new file mode 100644
index 000000000..e58b645b7
--- /dev/null
+++ b/src/ray/protobuf/BUILD
@@ -0,0 +1,121 @@
+package(default_visibility = ["//visibility:public"])
+
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_proto_library", "cc_test")
+load("@rules_proto_grpc//python:defs.bzl", "python_grpc_compile")
+
+proto_library(
+    name = "common_proto",
+    srcs = ["common.proto"],
+    visibility = ["//java:__subpackages__"],
+)
+
+cc_proto_library(
+    name = "common_cc_proto",
+    deps = [":common_proto"],
+)
+
+python_grpc_compile(
+    name = "common_py_proto",
+    deps = [":common_proto"],
+)
+
+proto_library(
+    name = "gcs_proto",
+    srcs = ["gcs.proto"],
+    visibility = ["//java:__subpackages__"],
+    deps = [":common_proto"],
+)
+
+cc_proto_library(
+    name = "gcs_cc_proto",
+    deps = [":gcs_proto"],
+)
+
+python_grpc_compile(
+    name = "gcs_py_proto",
+    deps = [":gcs_proto"],
+)
+
+proto_library(
+    name = "node_manager_proto",
+    srcs = ["node_manager.proto"],
+    deps = [":common_proto"],
+)
+
+cc_proto_library(
+    name = "node_manager_cc_proto",
+    deps = [":node_manager_proto"],
+)
+
+python_grpc_compile(
+    name = "node_manager_py_proto",
+    deps = [":node_manager_proto"],
+)
+
+proto_library(
+    name = "reporter_proto",
+    srcs = ["reporter.proto"],
+    deps = [":common_proto"],
+)
+
+cc_proto_library(
+    name = "reporter_cc_proto",
+    deps = [":reporter_proto"],
+)
+
+python_grpc_compile(
+    name = "reporter_py_proto",
+    deps = [":reporter_proto"],
+)
+
+proto_library(
+    name = "gcs_service_proto",
+    srcs = ["gcs_service.proto"],
+    deps = [
+        ":common_proto",
+        ":gcs_proto",
+    ],
+)
+
+cc_proto_library(
+    name = "gcs_service_cc_proto",
+    deps = [":gcs_service_proto"],
+)
+
+proto_library(
+    name = "object_manager_proto",
+    srcs = ["object_manager.proto"],
+)
+
+cc_proto_library(
+    name = "object_manager_cc_proto",
+    deps = [":object_manager_proto"],
+)
+
+proto_library(
+    name = "core_worker_proto",
+    srcs = ["core_worker.proto"],
+    deps = [":common_proto"],
+)
+
+python_grpc_compile(
+    name = "core_worker_py_proto",
+    deps = [":core_worker_proto"],
+)
+
+cc_proto_library(
+    name = "worker_cc_proto",
+    deps = ["core_worker_proto"],
+)
+
+proto_library(
+    name = "serialization_proto",
+    srcs = ["serialization.proto"],
+)
+
+cc_proto_library(
+    name = "serialization_cc_proto",
+    deps = ["serialization_proto"],
+)
+