diff --git a/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py b/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
index 03b1f3b..518fdd5 100755
--- a/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
+++ b/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
@@ -446,10 +446,6 @@
     '-//pw_crypto/...:all',  # TODO(b/236321905) Remove when passing.
     '-//pw_system/...:all',
     '-//pw_thread/py/...:all',
-    '-//pw_thread:thread_proto_py_pb2',
-    '-//pw_thread:thread_proto_py_pb2_genproto',
-    '-//pw_thread:thread_snapshot_service_py_pb2',
-    '-//pw_thread:thread_snapshot_service_py_pb2_genproto',
     '-//pw_thread_embos/...:all',
     '-//pw_thread_freertos/...:all',
     '-//pw_trace_tokenized/...:all',
diff --git a/pw_thread/BUILD.bazel b/pw_thread/BUILD.bazel
index 18d2761..283d62c 100644
--- a/pw_thread/BUILD.bazel
+++ b/pw_thread/BUILD.bazel
@@ -18,8 +18,8 @@
     "pw_cc_library",
     "pw_cc_test",
 )
+load("//pw_build/bazel_internal:py_proto_library.bzl", "py_proto_library")
 load("//pw_protobuf_compiler:proto.bzl", "pw_proto_library")
-load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -355,6 +355,7 @@
 # TODO(b/241456982): Not expected to build yet.
 py_proto_library(
     name = "thread_proto_py_pb2",
+    tags = ["manual"],
     deps = [":thread_proto"],
 )
 
@@ -375,6 +376,7 @@
 # TODO(b/241456982): Not expected to build yet.
 py_proto_library(
     name = "thread_snapshot_service_py_pb2",
+    tags = ["manual"],
     deps = [":thread_snapshot_service_proto"],
 )