diff --git a/openapi.yaml b/openapi.yaml
index 7cbade8c..fc2e0e1c 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -343,39 +343,38 @@ components:
       required:
         - sessionToken
     AuthMethod:
-      type: object
       discriminator:
         propertyName: type
-      properties:
-        type:
-          type: string
-      required:
-        - type
+        mapping:
+          apiKey: '#/components/schemas/ApiKey'
+          local: '#/components/schemas/Local'
       oneOf:
         - $ref: '#/components/schemas/ApiKey'
         - $ref: '#/components/schemas/Local'
     ApiKey:
       description: API key authentication
-      allOf:
-        - $ref: '#/components/schemas/AuthMethod'
-        - type: object
-          properties:
-            key:
-              type: string
-              description: The API key
-          required:
-            - key
+      type: object
+      properties:
+        type:
+          type: string
+        key:
+          type: string
+          description: The API key
+      required:
+        - key
+        - type
     Local:
       description: Authentication method for local applications. Uses file system access as proof of authentication.
-      allOf:
-        - $ref: '#/components/schemas/AuthMethod'
-        - type: object
-          properties:
-            authFileContent:
-              type: string
-              description: The contents of the local file $TEMP/xpipe_auth. This file is automatically generated when XPipe starts.
-          required:
-            - authFileContent
+      type: object
+      properties:
+        type:
+          type: string
+        authFileContent:
+          type: string
+          description: The contents of the local file $TEMP/xpipe_auth. This file is automatically generated when XPipe starts.
+      required:
+        - authFileContent
+        - type
     ClientInformation:
       type: object
       discriminator: