diff --git a/NuGet.config b/NuGet.config
index 9f84e0bca10f..661952811ac5 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -2,6 +2,7 @@
 <configuration>
   <packageSources>
     <clear />
+    <add key="local-openapi" value="local-packages" />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-dotnet -->
     <add key="darc-pub-dotnet-dotnet-78bac42" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-78bac42c/nuget/v3/index.json" />
diff --git a/eng/Versions.props b/eng/Versions.props
index edb7e6e4f777..89ba89414043 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -179,8 +179,8 @@
     <XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
     <XUnitRunnerVisualStudioVersion>3.1.3</XUnitRunnerVisualStudioVersion>
     <MicrosoftDataSqlClientVersion>5.2.2</MicrosoftDataSqlClientVersion>
-    <MicrosoftOpenApiVersion>2.0.0</MicrosoftOpenApiVersion>
-    <MicrosoftOpenApiYamlReaderVersion>2.0.0</MicrosoftOpenApiYamlReaderVersion>
+    <MicrosoftOpenApiVersion>2.9.0</MicrosoftOpenApiVersion>
+    <MicrosoftOpenApiYamlReaderVersion>2.9.0</MicrosoftOpenApiYamlReaderVersion>
     <!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
     <DotnetDumpVersion>6.0.322601</DotnetDumpVersion>
     <DotnetServeVersion>1.10.93</DotnetServeVersion>
diff --git a/local-packages/Microsoft.OpenApi.2.9.0.nupkg b/local-packages/Microsoft.OpenApi.2.9.0.nupkg
new file mode 100644
index 000000000000..8603afbc1218
Binary files /dev/null and b/local-packages/Microsoft.OpenApi.2.9.0.nupkg differ
diff --git a/local-packages/Microsoft.OpenApi.YamlReader.2.9.0.nupkg b/local-packages/Microsoft.OpenApi.YamlReader.2.9.0.nupkg
new file mode 100644
index 000000000000..7bc10e9a39e7
Binary files /dev/null and b/local-packages/Microsoft.OpenApi.YamlReader.2.9.0.nupkg differ
diff --git a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt
index 648510972ee6..d797ed256419 100644
--- a/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt
+++ b/src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_0/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt
@@ -667,14 +667,13 @@
             "content": {
               "application/json": {
                 "schema": {
+                  "type": "object",
                   "oneOf": [
-                    {
-                      "nullable": true
-                    },
                     {
                       "$ref": "#/components/schemas/NullableResponseModel"
                     }
-                  ]
+                  ],
+                  "nullable": true
                 }
               }
             }
@@ -691,14 +690,13 @@
           "content": {
             "application/json": {
               "schema": {
+                "type": "object",
                 "oneOf": [
-                  {
-                    "nullable": true
-                  },
                   {
                     "$ref": "#/components/schemas/NullableRequestModel"
                   }
-                ]
+                ],
+                "nullable": true
               }
             }
           }
@@ -873,14 +871,13 @@
             "type": "string"
           },
           "optionalNested": {
+            "type": "object",
             "oneOf": [
-              {
-                "nullable": true
-              },
               {
                 "$ref": "#/components/schemas/NestedModel"
               }
-            ]
+            ],
+            "nullable": true
           },
           "requiredNested": {
             "$ref": "#/components/schemas/NestedModel"
@@ -998,14 +995,13 @@
             "$ref": "#/components/schemas/TestEnum"
           },
           "nullableEnum": {
+            "type": "integer",
             "oneOf": [
-              {
-                "nullable": true
-              },
               {
                 "$ref": "#/components/schemas/TestEnum"
               }
-            ]
+            ],
+            "nullable": true
           },
           "listOfNullableEnums": {
             "type": "array",
@@ -1160,14 +1156,13 @@
             "nullable": true
           },
           "deepNested": {
+            "type": "object",
             "oneOf": [
-              {
-                "nullable": true
-              },
               {
                 "$ref": "#/components/schemas/ComplexType"
               }
-            ]
+            ],
+            "nullable": true
           }
         }
       },
@@ -1239,14 +1234,13 @@
             "nullable": true
           },
           "nullableComplexProperty": {
+            "type": "object",
             "oneOf": [
-              {
-                "nullable": true
-              },
               {
                 "$ref": "#/components/schemas/ComplexType"
               }
-            ]
+            ],
+            "nullable": true
           }
         }
       },
@@ -1475,14 +1469,13 @@
             "$ref": "#/components/schemas/RefProfile"
           },
           "secondaryUser": {
+            "type": "object",
             "oneOf": [
-              {
-                "nullable": true
-              },
               {
                 "$ref": "#/components/schemas/RefProfile"
               }
-            ]
+            ],
+            "nullable": true
           }
         }
       },