diff --git a/proto/kms/api/cmk/registry/tenant/v1/tenant.pb.go b/proto/kms/api/cmk/registry/tenant/v1/tenant.pb.go
index 8304ec6..f7f20d2 100644
--- a/proto/kms/api/cmk/registry/tenant/v1/tenant.pb.go
+++ b/proto/kms/api/cmk/registry/tenant/v1/tenant.pb.go
@@ -7,6 +7,7 @@
 package tenantv1
 
 import (
+	_ "buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go/buf/validate"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -1277,7 +1278,7 @@ var File_kms_api_cmk_registry_tenant_v1_tenant_proto protoreflect.FileDescriptor
 
 const file_kms_api_cmk_registry_tenant_v1_tenant_proto_rawDesc = "" +
 	"\n" +
-	"+kms/api/cmk/registry/tenant/v1/tenant.proto\x12\x1ekms.api.cmk.registry.tenant.v1\"\x8a\x04\n" +
+	"+kms/api/cmk/registry/tenant/v1/tenant.proto\x12\x1ekms.api.cmk.registry.tenant.v1\x1a\x1bbuf/validate/validate.proto\"\x8a\x04\n" +
 	"\x06Tenant\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\tR\x02id\x12\x12\n" +
 	"\x04name\x18\x02 \x01(\tR\x04name\x12\x16\n" +
@@ -1298,10 +1299,10 @@ const file_kms_api_cmk_registry_tenant_v1_tenant_proto_rawDesc = "" +
 	"userGroups\x1a9\n" +
 	"\vLabelsEntry\x12\x10\n" +
 	"\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" +
-	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xdd\x02\n" +
+	"\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xfc\x02\n" +
 	"\x15RegisterTenantRequest\x12\x12\n" +
-	"\x04name\x18\x01 \x01(\tR\x04name\x12\x0e\n" +
-	"\x02id\x18\x02 \x01(\tR\x02id\x12\x16\n" +
+	"\x04name\x18\x01 \x01(\tR\x04name\x12-\n" +
+	"\x02id\x18\x02 \x01(\tB\x1d\xbaH\x1ar\x18\x10\x01\x18(2\x12^[A-Za-z0-9._~-]+$R\x02id\x12\x16\n" +
 	"\x06region\x18\x03 \x01(\tR\x06region\x12\x19\n" +
 	"\bowner_id\x18\x04 \x01(\tR\aownerId\x12\x1d\n" +
 	"\n" +
diff --git a/proto/kms/api/cmk/registry/tenant/v1/tenant.proto b/proto/kms/api/cmk/registry/tenant/v1/tenant.proto
index 6db53c4..aa4f6bf 100644
--- a/proto/kms/api/cmk/registry/tenant/v1/tenant.proto
+++ b/proto/kms/api/cmk/registry/tenant/v1/tenant.proto
@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package kms.api.cmk.registry.tenant.v1;
 
+import "buf/validate/validate.proto";
+
 option go_package = "github.com/openkcm/api-sdk/proto/kms/api/cmk/registry/tenant/v1;tenantv1";
 
 service Service {
@@ -33,7 +35,11 @@ message Tenant {
 
 message RegisterTenantRequest {
   string name = 1;
-  string id = 2;
+  string id = 2 [
+    (buf.validate.field).string.min_len = 1,
+    (buf.validate.field).string.max_len = 40,
+    (buf.validate.field).string.pattern = "^[A-Za-z0-9._~-]+$"
+  ];
   string region = 3;
   string owner_id = 4;
   string owner_type = 5;