diff --git a/proto/zitadel/org/v2beta/org.proto b/proto/zitadel/org/v2beta/org.proto
index 33dbe48983..1a65782ff0 100644
--- a/proto/zitadel/org/v2beta/org.proto
+++ b/proto/zitadel/org/v2beta/org.proto
@@ -56,45 +56,42 @@ message OrgQueryFilter {
     }
 }
 message OrgNameQuery {
+    // Organization name.
     string name = 1 [
         (validate.rules).string = {max_len: 200},
         (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
             example: "\"ZITADEL\"";
         }
     ];
+  // Defines which text equality method is used.
     zitadel.object.v2beta.TextQueryMethod method = 2 [
-        (validate.rules).enum.defined_only = true,
-        (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
-            description: "defines which text equality method is used";
-        }
+        (validate.rules).enum.defined_only = true
     ];
 }
 
 message OrgDomainQuery {
+    // The domain.
     string domain = 1 [
         (validate.rules).string = {max_len: 200},
         (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
             example: "\"zitadel.cloud\"";
         }
     ];
+  // Defines which text equality method is used.
     zitadel.object.v2beta.TextQueryMethod method = 2 [
-        (validate.rules).enum.defined_only = true,
-        (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
-            description: "defines which text equality method is used";
-        }
+        (validate.rules).enum.defined_only = true
     ];
 }
 
 message OrgStateQuery {
+    // Current state of the organization.
     OrgState state = 1 [
-        (validate.rules).enum.defined_only = true,
-        (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
-            description: "current state of the organization";
-        }
+        (validate.rules).enum.defined_only = true
     ];
 }
 
 message OrgIDQuery {
+    // The Organization id.
     string id = 1 [
         (validate.rules).string = {max_len: 200},
         (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
@@ -107,55 +104,45 @@ message OrgIDQuery {
 message DomainSearchQuery {
     oneof query {
         option (validate.required) = true;
-
         DomainNameQuery domain_name_query = 1;
     }
 }
 
 // from proto/zitadel/org.proto
 message DomainNameQuery {
+    // The domain.
     string name = 1 [
         (validate.rules).string = {max_len: 200},
         (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
             example: "\"zitadel.cloud\"";
         }
     ];
+  // Defines which text equality method is used.
     zitadel.object.v2beta.TextQueryMethod method = 2 [
-        (validate.rules).enum.defined_only = true,
-        (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
-            description: "defines which text equality method is used";
-        }
+        (validate.rules).enum.defined_only = true
     ];
 }
 
 // from proto/zitadel/org.proto
 message Domain {
+    // The Organization id.
     string org_id = 1 [
         (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
             example: "\"69629023906488334\""
         }
     ];
-    zitadel.object.v2beta.Details details = 2;
-    string domain_name = 3 [
+    // The domain name.
+    string domain_name = 2 [
         (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
             example: "\"zitadel.com\"";
         }
     ];
-    bool is_verified = 4 [
-        (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
-            description: "defines if the domain is verified"
-        }
-    ];
-    bool is_primary = 5 [
-        (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
-            description: "defines if the domain is the primary domain"
-        }
-    ];
-    DomainValidationType validation_type = 6 [
-        (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
-            description: "defines the protocol the domain was validated with";
-        }
-    ];
+    // Defines if the domain is verified.
+    bool is_verified = 3;
+    // Defines if the domain is the primary domain.
+    bool is_primary = 4;
+    // Defines the protocol the domain was validated with.
+    DomainValidationType validation_type = 5;
 }
 
 // from proto/zitadel/org.proto