diff --git a/Makefile b/Makefile
index 5cbbdef6c52..93ef2337e60 100644
--- a/Makefile
+++ b/Makefile
@@ -642,12 +642,12 @@ proto: proto-prepare-otel
 
 	$(PROTOC) \
 		-Imodel/proto \
-		--go_out=$(PWD)/model/prototest/ \
+		--go_out=$(PWD)/model/ \
 		model/proto/model_test.proto
 
 	$(PROTOC) \
 		-Iplugin/storage/grpc/proto \
-		--go_out=$(PWD)/plugin/storage/grpc/proto/storageprototest/ \
+		--go_out=$(PWD)/plugin/storage/grpc/proto/ \
 		plugin/storage/grpc/proto/storage_test.proto
 
 	$(PROTOC) \
diff --git a/go.mod b/go.mod
index dbe36852e53..51f30acc92f 100644
--- a/go.mod
+++ b/go.mod
@@ -23,6 +23,7 @@ require (
 	github.com/gocql/gocql v1.3.2
 	github.com/gogo/googleapis v1.4.1
 	github.com/gogo/protobuf v1.3.2
+	github.com/golang/protobuf v1.5.3
 	github.com/gorilla/handlers v1.5.1
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -120,7 +121,6 @@ require (
 	github.com/go-openapi/jsonreference v0.20.0 // indirect
 	github.com/golang/glog v1.1.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/flatbuffers v1.12.1 // indirect
 	github.com/google/uuid v1.3.1 // indirect
diff --git a/model/proto/model_test.proto b/model/proto/model_test.proto
index 9122d25c6e0..fdbaa7e638b 100644
--- a/model/proto/model_test.proto
+++ b/model/proto/model_test.proto
@@ -16,6 +16,8 @@ syntax="proto3";
 
 package prototest;
 
+option go_package = "./prototest";
+
 enum SpanRefType {
     CHILD_OF = 0;
     FOLLOWS_FROM = 1;
diff --git a/model/prototest/model_test.pb.go b/model/prototest/model_test.pb.go
index d0714c33ac9..dd5aa163506 100644
--- a/model/prototest/model_test.pb.go
+++ b/model/prototest/model_test.pb.go
@@ -14,8 +14,8 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0-devel
-// 	protoc        v3.19.4
+// 	protoc-gen-go v1.31.0
+// 	protoc        v3.14.0
 // source: model_test.proto
 
 package prototest
@@ -157,8 +157,9 @@ var file_model_test_proto_rawDesc = []byte{
 	0x65, 0x66, 0x54, 0x79, 0x70, 0x65, 0x52, 0x07, 0x72, 0x65, 0x66, 0x54, 0x79, 0x70, 0x65, 0x2a,
 	0x2d, 0x0a, 0x0b, 0x53, 0x70, 0x61, 0x6e, 0x52, 0x65, 0x66, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0c,
 	0x0a, 0x08, 0x43, 0x48, 0x49, 0x4c, 0x44, 0x5f, 0x4f, 0x46, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c,
-	0x46, 0x4f, 0x4c, 0x4c, 0x4f, 0x57, 0x53, 0x5f, 0x46, 0x52, 0x4f, 0x4d, 0x10, 0x01, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x46, 0x4f, 0x4c, 0x4c, 0x4f, 0x57, 0x53, 0x5f, 0x46, 0x52, 0x4f, 0x4d, 0x10, 0x01, 0x42, 0x0d,
+	0x5a, 0x0b, 0x2e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x65, 0x73, 0x74, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/plugin/storage/grpc/proto/storage_test.proto b/plugin/storage/grpc/proto/storage_test.proto
index 972fc1e08ce..b279e05dbab 100644
--- a/plugin/storage/grpc/proto/storage_test.proto
+++ b/plugin/storage/grpc/proto/storage_test.proto
@@ -16,6 +16,8 @@ syntax="proto3";
 
 package storageprototest;
 
+option go_package = "./storageprototest";
+
 message GetTraceRequest {
     bytes trace_id = 1;
 }
diff --git a/plugin/storage/grpc/proto/storageprototest/storage_test.pb.go b/plugin/storage/grpc/proto/storageprototest/storage_test.pb.go
index 5fc753eca49..369e573cf8f 100644
--- a/plugin/storage/grpc/proto/storageprototest/storage_test.pb.go
+++ b/plugin/storage/grpc/proto/storageprototest/storage_test.pb.go
@@ -14,8 +14,8 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.25.0-devel
-// 	protoc        v3.19.4
+// 	protoc-gen-go v1.31.0
+// 	protoc        v3.14.0
 // source: storage_test.proto
 
 package storageprototest
@@ -89,7 +89,9 @@ var file_storage_test_proto_rawDesc = []byte{
 	0x74, 0x6f, 0x74, 0x65, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x54, 0x72, 0x61,
 	0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x74, 0x72, 0x61,
 	0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x74, 0x72, 0x61,
-	0x63, 0x65, 0x49, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x63, 0x65, 0x49, 0x64, 0x42, 0x14, 0x5a, 0x12, 0x2e, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67,
+	0x65, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x65, 0x73, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
diff --git a/proto-gen/api_v3/query_service.pb.gw.go b/proto-gen/api_v3/query_service.pb.gw.go
index d54d6f84fab..d393094c306 100644
--- a/proto-gen/api_v3/query_service.pb.gw.go
+++ b/proto-gen/api_v3/query_service.pb.gw.go
@@ -369,4 +369,4 @@ var (
 	forward_QueryService_GetServices_0 = runtime.ForwardResponseMessage
 
 	forward_QueryService_GetOperations_0 = runtime.ForwardResponseMessage
-)
\ No newline at end of file
+)