diff --git a/proto/zitadel/org/v2beta/org_service.proto b/proto/zitadel/org/v2beta/org_service.proto
index c43c56b777..ba1c37c0d4 100644
--- a/proto/zitadel/org/v2beta/org_service.proto
+++ b/proto/zitadel/org/v2beta/org_service.proto
@@ -19,93 +19,93 @@ import "zitadel/filter/v2beta/filter.proto";
 
 option go_package = "github.com/zitadel/zitadel/pkg/grpc/org/v2beta;org";
 
-option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
-  info: {
-    title: "Organization Service";
-    version: "2.0-beta";
-    description: "This API is intended to manage organizations in a ZITADEL instance. This project is in beta state. It can AND will continue breaking until the services provide the same functionality as the current login.";
-    contact:{
-      name: "ZITADEL"
-      url: "https://zitadel.com"
-      email: "hi@zitadel.com"
-    }
-    license: {
-      name: "Apache 2.0",
-      url: "https://github.com/zitadel/zitadel/blob/main/LICENSING.md";
-    };
-  };
-  schemes: HTTPS;
-  schemes: HTTP;
+// option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
+//   info: {
+//     title: "Organization Service (Beta)";
+//     version: "2.0-beta";
+//     description: "This API is intended to manage organizations in a ZITADEL instance. This project is in beta state. It can AND will continue breaking until the services provide the same functionality as the current login.";
+//     contact:{
+//       name: "ZITADEL"
+//       url: "https://zitadel.com"
+//       email: "hi@zitadel.com"
+//     }
+//     license: {
+//       name: "Apache 2.0",
+//       url: "https://github.com/zitadel/zitadel/blob/main/LICENSING.md";
+//     };
+//   };
+//   schemes: HTTPS;
+//   schemes: HTTP;
 
-  consumes: "application/json";
-  consumes: "application/grpc";
+//   consumes: "application/json";
+//   consumes: "application/grpc";
 
-  produces: "application/json";
-  produces: "application/grpc";
+//   produces: "application/json";
+//   produces: "application/grpc";
 
-  consumes: "application/grpc-web+proto";
-  produces: "application/grpc-web+proto";
+//   consumes: "application/grpc-web+proto";
+//   produces: "application/grpc-web+proto";
 
-  host: "$CUSTOM-DOMAIN";
-  base_path: "/";
+//   host: "$CUSTOM-DOMAIN";
+//   base_path: "/";
 
-  external_docs: {
-    description: "Detailed information about ZITADEL",
-    url: "https://zitadel.com/docs"
-  }
-  security_definitions: {
-    security: {
-      key: "OAuth2";
-      value: {
-        type: TYPE_OAUTH2;
-        flow: FLOW_ACCESS_CODE;
-        authorization_url: "$CUSTOM-DOMAIN/oauth/v2/authorize";
-        token_url: "$CUSTOM-DOMAIN/oauth/v2/token";
-        scopes: {
-          scope: {
-            key: "openid";
-            value: "openid";
-          }
-          scope: {
-            key: "urn:zitadel:iam:org:project:id:zitadel:aud";
-            value: "urn:zitadel:iam:org:project:id:zitadel:aud";
-          }
-        }
-      }
-    }
-  }
-  security: {
-    security_requirement: {
-      key: "OAuth2";
-      value: {
-        scope: "openid";
-        scope: "urn:zitadel:iam:org:project:id:zitadel:aud";
-      }
-    }
-  }
-  responses: {
-    key: "403";
-    value: {
-      description: "Returned when the user does not have permission to access the resource.";
-      schema: {
-        json_schema: {
-          ref: "#/definitions/rpcStatus";
-        }
-      }
-    }
-  }
-  responses: {
-    key: "404";
-    value: {
-      description: "Returned when the resource does not exist.";
-      schema: {
-        json_schema: {
-          ref: "#/definitions/rpcStatus";
-        }
-      }
-    }
-  }
-};
+//   external_docs: {
+//     description: "Detailed information about ZITADEL",
+//     url: "https://zitadel.com/docs"
+//   }
+//   security_definitions: {
+//     security: {
+//       key: "OAuth2";
+//       value: {
+//         type: TYPE_OAUTH2;
+//         flow: FLOW_ACCESS_CODE;
+//         authorization_url: "$CUSTOM-DOMAIN/oauth/v2/authorize";
+//         token_url: "$CUSTOM-DOMAIN/oauth/v2/token";
+//         scopes: {
+//           scope: {
+//             key: "openid";
+//             value: "openid";
+//           }
+//           scope: {
+//             key: "urn:zitadel:iam:org:project:id:zitadel:aud";
+//             value: "urn:zitadel:iam:org:project:id:zitadel:aud";
+//           }
+//         }
+//       }
+//     }
+//   }
+//   security: {
+//     security_requirement: {
+//       key: "OAuth2";
+//       value: {
+//         scope: "openid";
+//         scope: "urn:zitadel:iam:org:project:id:zitadel:aud";
+//       }
+//     }
+//   }
+//   responses: {
+//     key: "403";
+//     value: {
+//       description: "Returned when the user does not have permission to access the resource.";
+//       schema: {
+//         json_schema: {
+//           ref: "#/definitions/rpcStatus";
+//         }
+//       }
+//     }
+//   }
+//   responses: {
+//     key: "404";
+//     value: {
+//       description: "Returned when the resource does not exist.";
+//       schema: {
+//         json_schema: {
+//           ref: "#/definitions/rpcStatus";
+//         }
+//       }
+//     }
+//   }
+// };
 
 service OrganizationService {
 
@@ -659,7 +659,6 @@ message DeleteOrganizationDomainRequest {
   string domain = 2 [
     (validate.rules).string = {min_len: 1, max_len: 200},
     (google.api.field_behavior) = REQUIRED,
-  // repeated ProjectRoleFilter filters = 4;
     (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
         min_length: 1;
         max_length: 200;
@@ -703,11 +702,13 @@ message GenerateOrganizationDomainValidationRequest {
 }
 
 message GenerateOrganizationDomainValidationResponse {
+  // The token verify domain.
   string token = 1 [
     (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
         example: "\"ofSBHsSAVHAoTIE4Iv2gwhaYhTjcY5QX\"";
     }
   ];
+  // URL used to verify the domain.
   string url = 2 [
     (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
         example: "\"https://testdomain.com/.well-known/zitadel-challenge/ofSBHsSAVHAoTIE4Iv2gwhaYhTjcY5QX\"";
@@ -748,7 +749,9 @@ message VerifyOrganizationDomainResponse {
 }
 
 message Metadata {
+  // Key in the metadata key/value pair.
   string key = 1 [(validate.rules).string = {min_len: 1, max_len: 200}];
+  // Value in the metadata key/value pair.
   bytes value = 2 [(validate.rules).bytes = {min_len: 1, max_len: 500000}];
 }
 message SetOrganizationMetadataRequest{