diff --git a/buf.yaml b/buf.yaml
index 3b4484ca..61b5f343 100644
--- a/buf.yaml
+++ b/buf.yaml
@@ -1,5 +1,8 @@
 version: v2
 modules:
+  - path: packages/node/src/proto
+    name: buf.build/topology/node
+
   - path: packages/object/src/proto
     name: buf.build/topology/object
 
diff --git a/packages/node/src/proto/rpc.proto b/packages/node/src/proto/topology/node/rpc.proto
similarity index 100%
rename from packages/node/src/proto/rpc.proto
rename to packages/node/src/proto/topology/node/rpc.proto
diff --git a/packages/node/src/proto/rpc_grpc_pb.js b/packages/node/src/proto/topology/node/rpc_grpc_pb.js
similarity index 100%
rename from packages/node/src/proto/rpc_grpc_pb.js
rename to packages/node/src/proto/topology/node/rpc_grpc_pb.js
diff --git a/packages/node/src/proto/rpc_pb.ts b/packages/node/src/proto/topology/node/rpc_pb.ts
similarity index 100%
rename from packages/node/src/proto/rpc_pb.ts
rename to packages/node/src/proto/topology/node/rpc_pb.ts
diff --git a/packages/node/src/rpc/index.ts b/packages/node/src/rpc/index.ts
index 30c58a19..480eac2d 100644
--- a/packages/node/src/rpc/index.ts
+++ b/packages/node/src/rpc/index.ts
@@ -3,7 +3,7 @@ import * as grpc from "@grpc/grpc-js";
 import type { ServerUnaryCall, sendUnaryData } from "@grpc/grpc-js";
 import { Logger } from "@topology-foundation/logger";
 import type { TopologyNode } from "../index.js";
-import { TopologyRpcService } from "../proto/rpc_grpc_pb.js";
+import { TopologyRpcService } from "../proto/topology/node/rpc_grpc_pb.js";
 import type {
 	GetCroHashGraphRequest,
 	GetCroHashGraphResponse,
@@ -11,7 +11,7 @@ import type {
 	SubscribeCroResponse,
 	UnsubscribeCroRequest,
 	UnsubscribeCroResponse,
-} from "../proto/rpc_pb.js";
+} from "../proto/topology/node/rpc_pb.js";
 
 export function init(node: TopologyNode) {
 	const log = new Logger(