diff --git a/package-versions.props b/package-versions.props
index a13e2c37eb..72a3c86c19 100644
--- a/package-versions.props
+++ b/package-versions.props
@@ -4,7 +4,7 @@
     <CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
     <DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
     <HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
-    <SwashbuckleFrozenVersion>7.2.0</SwashbuckleFrozenVersion>
+    <SwashbuckleFrozenVersion>8.0.0</SwashbuckleFrozenVersion>
     <NewtonsoftJsonFrozenVersion>13.0.3</NewtonsoftJsonFrozenVersion>
 
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
@@ -22,8 +22,8 @@
     <MicrosoftApiServerVersion>9.0.*</MicrosoftApiServerVersion>
     <NSwagApiClientVersion>14.2.*</NSwagApiClientVersion>
     <NewtonsoftJsonVersion>13.0.*</NewtonsoftJsonVersion>
-    <ScalarAspNetCoreVersion>2.0.*</ScalarAspNetCoreVersion>
-    <SwashbuckleVersion>7.*-*</SwashbuckleVersion>
+    <ScalarAspNetCoreVersion>2.1.*</ScalarAspNetCoreVersion>
+    <SwashbuckleVersion>8.*-*</SwashbuckleVersion>
     <SystemTextJsonVersion>9.0.*</SystemTextJsonVersion>
     <TestSdkVersion>17.12.*</TestSdkVersion>
     <XunitVersion>2.9.*</XunitVersion>
diff --git a/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json b/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json
index d3a9f8ee19..6eab88e043 100644
--- a/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json
+++ b/src/Examples/JsonApiDotNetCoreExample/GeneratedSwagger/JsonApiDotNetCoreExample.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "JsonApiDotNetCoreExample",
     "version": "1.0"
diff --git a/test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json
index 1feebb1ba9..6d9f8b5b6d 100644
--- a/test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/AtomicOperations/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/ClientIdGenerationModes/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/ClientIdGenerationModes/GeneratedSwagger/swagger.g.json
index bd06d3e570..4db734c7e9 100644
--- a/test/OpenApiTests/ClientIdGenerationModes/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/ClientIdGenerationModes/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/Headers/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/Headers/GeneratedSwagger/swagger.g.json
index ebb2e64fa6..ff402710af 100644
--- a/test/OpenApiTests/Headers/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/Headers/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/LegacyOpenApi/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/LegacyOpenApi/GeneratedSwagger/swagger.g.json
index 0507e301c1..e1643958dd 100644
--- a/test/OpenApiTests/LegacyOpenApi/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/LegacyOpenApi/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/LegacyOpenApi/expected-swagger.json b/test/OpenApiTests/LegacyOpenApi/expected-swagger.json
index 0507e301c1..e1643958dd 100644
--- a/test/OpenApiTests/LegacyOpenApi/expected-swagger.json
+++ b/test/OpenApiTests/LegacyOpenApi/expected-swagger.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/Links/Enabled/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/Links/Enabled/GeneratedSwagger/swagger.g.json
index 0b6b1d7cb3..3db474a261 100644
--- a/test/OpenApiTests/Links/Enabled/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/Links/Enabled/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/ModelStateValidation/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/ModelStateValidation/GeneratedSwagger/swagger.g.json
index 28dd13c8a8..dc36360d10 100644
--- a/test/OpenApiTests/ModelStateValidation/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/ModelStateValidation/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json
index 02adac13a6..5c4cae0ae1 100644
--- a/test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/NamingConventions/CamelCase/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/NamingConventions/KebabCase/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/NamingConventions/KebabCase/GeneratedSwagger/swagger.g.json
index d4350dd2ab..c645f772dc 100644
--- a/test/OpenApiTests/NamingConventions/KebabCase/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/NamingConventions/KebabCase/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/NamingConventions/PascalCase/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/NamingConventions/PascalCase/GeneratedSwagger/swagger.g.json
index 03d0307ea6..c3572c5780 100644
--- a/test/OpenApiTests/NamingConventions/PascalCase/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/NamingConventions/PascalCase/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/QueryStrings/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/QueryStrings/GeneratedSwagger/swagger.g.json
index e3d8c75cb8..ff4b8e0b28 100644
--- a/test/OpenApiTests/QueryStrings/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/QueryStrings/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOff/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOff/GeneratedSwagger/swagger.g.json
index fa7ae3293a..13433002ba 100644
--- a/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOff/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOff/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOn/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOn/GeneratedSwagger/swagger.g.json
index 36f5cecba5..1dee75173f 100644
--- a/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOn/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOff/ModelStateValidationOn/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOff/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOff/GeneratedSwagger/swagger.g.json
index e339f2faaa..85591bdc4c 100644
--- a/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOff/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOff/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOn/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOn/GeneratedSwagger/swagger.g.json
index c358e512b8..a059d33d88 100644
--- a/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOn/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/ResourceFieldValidation/NullableReferenceTypesOn/ModelStateValidationOn/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"
diff --git a/test/OpenApiTests/RestrictedControllers/GeneratedSwagger/swagger.g.json b/test/OpenApiTests/RestrictedControllers/GeneratedSwagger/swagger.g.json
index 901ae36b7e..ca383f3b8e 100644
--- a/test/OpenApiTests/RestrictedControllers/GeneratedSwagger/swagger.g.json
+++ b/test/OpenApiTests/RestrictedControllers/GeneratedSwagger/swagger.g.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.0.1",
+  "openapi": "3.0.4",
   "info": {
     "title": "OpenApiTests",
     "version": "1.0"