diff --git a/pkg/server/openapi/OWNERS b/pkg/server/openapi/OWNERS
index ff1b3199b..7c8ad60c5 100755
--- a/pkg/server/openapi/OWNERS
+++ b/pkg/server/openapi/OWNERS
@@ -3,3 +3,5 @@ reviewers:
 - gmarek
 - mbohlool
 - philips
+approvers:
+- mbohlool
diff --git a/pkg/server/openapi/openapi.go b/pkg/server/openapi/openapi.go
index 10f3872c1..6bcb987d9 100644
--- a/pkg/server/openapi/openapi.go
+++ b/pkg/server/openapi/openapi.go
@@ -127,6 +127,7 @@ func (o *openAPI) buildDefinitionRecursively(name string) error {
 	}
 	if item, ok := o.definitions[name]; ok {
 		schema := spec.Schema{
+			VendorExtensible:   item.Schema.VendorExtensible,
 			SchemaProps:        item.Schema.SchemaProps,
 			SwaggerSchemaProps: item.Schema.SwaggerSchemaProps,
 		}
diff --git a/pkg/server/openapi/openapi_test.go b/pkg/server/openapi/openapi_test.go
index f0a922a2d..de6011c2a 100644
--- a/pkg/server/openapi/openapi_test.go
+++ b/pkg/server/openapi/openapi_test.go
@@ -97,6 +97,7 @@ func (_ TestInput) OpenAPIDefinition() *openapi.OpenAPIDefinition {
 			},
 		},
 	}
+	schema.Extensions = spec.Extensions{"x-test": "test"}
 	return &openapi.OpenAPIDefinition{
 		Schema:       schema,
 		Dependencies: []string{},
@@ -385,6 +386,11 @@ func getTestInputDefinition() spec.Schema {
 				},
 			},
 		},
+		VendorExtensible: spec.VendorExtensible{
+			Extensions: spec.Extensions{
+				"x-test": "test",
+			},
+		},
 	}
 }