diff --git a/kong/mcp/ai-mcp-proxy.yaml b/kong/mcp/ai-mcp-proxy.yaml
index 53b44fd..7652afe 100644
--- a/kong/mcp/ai-mcp-proxy.yaml
+++ b/kong/mcp/ai-mcp-proxy.yaml
@@ -57,13 +57,15 @@ config:
                   type: integer
                   example: 123
                 next:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   format: uri
                   example: http://api.example.org/accounts/?page=4
                 previous:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   format: uri
                   example: http://api.example.org/accounts/?page=2
                 results:
@@ -85,12 +87,14 @@ config:
                         type: string
                         maxLength: 50
                       addressline2:
-                        type: string
-                        nullable: true
+                        type:
+                        - string
+                        - 'null'
                         maxLength: 50
                       state:
-                        type: string
-                        nullable: true
+                        type:
+                        - string
+                        - 'null'
                         maxLength: 50
                       country:
                         type: string
@@ -155,12 +159,14 @@ config:
                   type: string
                   maxLength: 50
                 addressline2:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   maxLength: 50
                 state:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   maxLength: 50
                 country:
                   type: string
@@ -228,13 +234,15 @@ config:
                   type: integer
                   example: 123
                 next:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   format: uri
                   example: http://api.example.org/accounts/?page=4
                 previous:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   format: uri
                   example: http://api.example.org/accounts/?page=2
                 results:
@@ -265,10 +273,11 @@ config:
                       officecode:
                         type: string
                       reportsto:
-                        type: integer
+                        type:
+                        - integer
+                        - 'null'
                         maximum: 2147483647
                         minimum: -2147483648
-                        nullable: true
                     required:
                     - email
                     - employeenumber
@@ -346,12 +355,14 @@ config:
                   type: string
                   maxLength: 50
                 addressline2:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   maxLength: 50
                 state:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   maxLength: 50
                 country:
                   type: string
@@ -412,13 +423,15 @@ config:
                   type: integer
                   example: 123
                 next:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   format: uri
                   example: http://api.example.org/accounts/?page=4
                 previous:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   format: uri
                   example: http://api.example.org/accounts/?page=2
                 results:
@@ -449,10 +462,11 @@ config:
                       officecode:
                         type: string
                       reportsto:
-                        type: integer
+                        type:
+                        - integer
+                        - 'null'
                         maximum: 2147483647
                         minimum: -2147483648
-                        nullable: true
                     required:
                     - email
                     - employeenumber
@@ -516,10 +530,11 @@ config:
                 officecode:
                   type: string
                 reportsto:
-                  type: integer
+                  type:
+                  - integer
+                  - 'null'
                   maximum: 2147483647
                   minimum: -2147483648
-                  nullable: true
               required:
               - email
               - employeenumber
@@ -577,13 +592,15 @@ config:
                   type: integer
                   example: 123
                 next:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   format: uri
                   example: http://api.example.org/accounts/?page=4
                 previous:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   format: uri
                   example: http://api.example.org/accounts/?page=2
                 results:
@@ -614,10 +631,11 @@ config:
                       officecode:
                         type: string
                       reportsto:
-                        type: integer
+                        type:
+                        - integer
+                        - 'null'
                         maximum: 2147483647
                         minimum: -2147483648
-                        nullable: true
                     required:
                     - email
                     - employeenumber
@@ -675,13 +693,15 @@ config:
                   type: integer
                   example: 123
                 next:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   format: uri
                   example: http://api.example.org/accounts/?page=4
                 previous:
-                  type: string
-                  nullable: true
+                  type:
+                  - string
+                  - 'null'
                   format: uri
                   example: http://api.example.org/accounts/?page=2
                 results:
@@ -710,33 +730,38 @@ config:
                         type: string
                         maxLength: 50
                       addressline2:
-                        type: string
-                        nullable: true
+                        type:
+                        - string
+                        - 'null'
                         maxLength: 50
                       city:
                         type: string
                         maxLength: 50
                       state:
-                        type: string
-                        nullable: true
+                        type:
+                        - string
+                        - 'null'
                         maxLength: 50
                       postalcode:
-                        type: string
-                        nullable: true
+                        type:
+                        - string
+                        - 'null'
                         maxLength: 15
                       country:
                         type: string
                         maxLength: 50
                       creditlimit:
-                        type: string
+                        type:
+                        - string
+                        - 'null'
                         format: decimal
                         pattern: ^-?\d{0,8}(?:\.\d{0,2})?$
-                        nullable: true
                       salesrepemployeenumber:
-                        type: integer
+                        type:
+                        - integer
+                        - 'null'
                         maximum: 2147483647
                         minimum: -2147483648
-                        nullable: true
                     required:
                     - addressline1
                     - city
@@ -822,10 +847,11 @@ config:
                 officecode:
                   type: string
                 reportsto:
-                  type: integer
+                  type:
+                  - integer
+                  - 'null'
                   maximum: 2147483647
                   minimum: -2147483648
-                  nullable: true
               required:
               - email
               - employeenumber