diff --git a/proto/zitadel/admin.proto b/proto/zitadel/admin.proto
index 0894f13c3f..197022df45 100644
--- a/proto/zitadel/admin.proto
+++ b/proto/zitadel/admin.proto
@@ -47,9 +47,17 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     produces: "application/json";
     produces: "application/grpc";
 
-    host: "api.zitadel.io";
+    consumes: "application/grpc-web+proto";
+    produces: "application/grpc-web+proto";
+
+    host: "api.zitadel.ch";
     base_path: "/admin/v1";
 
+    external_docs: {
+        description: "Detailed information about ZITADEL",
+        url: "https://docs.zitadel.ch"
+    }
+
     security_definitions: {
 		security: {
 			key: "BasicAuth";
diff --git a/proto/zitadel/auth.proto b/proto/zitadel/auth.proto
index c2cb85dbb7..0fcb510b8f 100644
--- a/proto/zitadel/auth.proto
+++ b/proto/zitadel/auth.proto
@@ -38,9 +38,19 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
 
     consumes: "application/json";
     consumes: "application/grpc";
+    consumes: "application/grpc-web+proto";
 
     produces: "application/json";
     produces: "application/grpc";
+    produces: "application/grpc-web+proto";
+
+    host: "api.zitadel.ch";
+    base_path: "/auth/v1";
+
+    external_docs: {
+        description: "Detailed information about ZITADEL",
+        url: "https://docs.zitadel.ch"
+    }
 };
 
 
diff --git a/proto/zitadel/management.proto b/proto/zitadel/management.proto
index dc12b46962..0c7e2acfd7 100644
--- a/proto/zitadel/management.proto
+++ b/proto/zitadel/management.proto
@@ -45,6 +45,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     };
 
     schemes: HTTPS;
+
     consumes: "application/json";
     produces: "application/json";
 
@@ -54,11 +55,20 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
     consumes: "application/grpc-web+proto";
     produces: "application/grpc-web+proto";
 
+    host: "api.zitadel.ch";
+    base_path: "/management/v1";
 
     external_docs: {
         description: "Detailed information about ZITADEL",
         url: "https://docs.zitadel.ch"
     }
+
+    extensions: {
+		key: "x-zitadel-orgid";
+		value: {
+			string_value: "your-org-id";
+		}
+	}
 };