diff --git a/README.md b/README.md
index 8044653925..bfd7dd1f50 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ A collection of Visual Studio C# custom tool code generators for Swagger / OpenA
 
 - ***NSwagCodeGenerator*** - Generates a single file C# REST API Client using the [NSwag.CodeGeneration.CSharp](https://github.com/RSuter/NSwag/wiki/CSharpClientGenerator) [nuget package](https://www.nuget.org/packages/NSwag.CodeGeneration.CSharp/) **v13.19.0**
 
-- ***OpenApiCodeGenerator*** - Generates a single file C# REST API Client using **[OpenAPI Generator v6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)**.
+- ***OpenApiCodeGenerator*** - Generates a single file C# REST API Client using **[OpenAPI Generator v7.0.0-beta](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.0.0-beta)**.
 The output file is the result of merging all the files generated using the OpenAPI Generator tool with:
 ` generate -g csharp --input-spec [swagger file] --output [output file] -DapiTests=false -DmodelTests=false -DpackageName=[default namespace] --skip-overwrite`
 
@@ -256,7 +256,7 @@ Options:
 Commands:
   csharp             Generate C# API clients
   jmeter             Generate Apache JMeter test plans
-  openapi-generator  Generate code using OpenAPI Generator (v6.6.0).
+  openapi-generator  Generate code using OpenAPI Generator (v7.0.0-beta).
                      See supported generators at https://openapi-generator.tech/docs/generators/
   typescript         Generate TypeScript API clients
 
@@ -295,7 +295,7 @@ Commands:
   autorest      AutoRest (v3.0.0-beta.20210504.2)
   kiota         Microsoft project Kiota (v1.4.0)
   nswag         NSwag (v13.19.0)
-  openapi       OpenAPI Generator (v6.6.0)
+  openapi       OpenAPI Generator (v7.0.0-beta)
   refitter      Refitter (v0.6.2)
   swagger       Swagger Codegen CLI (v3.0.34)
 
diff --git a/docs/CLI.md b/docs/CLI.md
index 5d1a3d4bb0..70afd6db8f 100644
--- a/docs/CLI.md
+++ b/docs/CLI.md
@@ -27,7 +27,7 @@ Options:
 Commands:
   csharp             Generate C# API clients
   jmeter             Generate Apache JMeter test plans
-  openapi-generator  Generate code using OpenAPI Generator (v6.6.0).
+  openapi-generator  Generate code using OpenAPI Generator (v7.0.0-beta).
                      See supported generators at https://openapi-generator.tech/docs/generators/
   typescript         Generate TypeScript API clients
 
@@ -66,7 +66,7 @@ Commands:
   autorest      AutoRest (v3.0.0-beta.20210504.2)
   kiota         Microsoft project Kiota (v1.4.0)
   nswag         NSwag (v13.19.0)
-  openapi       OpenAPI Generator (v6.6.0)
+  openapi       OpenAPI Generator (v7.0.0-beta)
   refitter      Refitter (v0.6.2)
   swagger       Swagger Codegen CLI (v3.0.34)
 
diff --git a/docs/Marketplace.md b/docs/Marketplace.md
index 854862f002..c7cb705634 100644
--- a/docs/Marketplace.md
+++ b/docs/Marketplace.md
@@ -19,7 +19,7 @@ A collection of Visual Studio C# custom tool code generators for Swagger / OpenA
 
 - ***NSwagCodeGenerator*** - Generates a single file C# REST API Client using the [NSwag.CodeGeneration.CSharp](https://github.com/RSuter/NSwag/wiki/CSharpClientGenerator) [nuget package](https://www.nuget.org/packages/NSwag.CodeGeneration.CSharp/) **v13.19.0**
 
-- ***OpenApiCodeGenerator*** - Generates a single file C# REST API Client using **[OpenAPI Generator v6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)**.
+- ***OpenApiCodeGenerator*** - Generates a single file C# REST API Client using **[OpenAPI Generator v7.0.0-beta](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.0.0-beta)**.
 The output file is the result of merging all the files generated using the OpenAPI Generator tool with:
 ` generate -g csharp --input-spec [swagger file] --output [output file] -DapiTests=false -DmodelTests=false -DpackageName=[default namespace] --skip-overwrite`
 
diff --git a/docs/Marketplace2022.md b/docs/Marketplace2022.md
index 4392e2407b..550bb954fe 100644
--- a/docs/Marketplace2022.md
+++ b/docs/Marketplace2022.md
@@ -19,7 +19,7 @@ A collection of Visual Studio C# custom tool code generators for Swagger / OpenA
 
 - ***NSwagCodeGenerator*** - Generates a single file C# REST API Client using the [NSwag.CodeGeneration.CSharp](https://github.com/RSuter/NSwag/wiki/CSharpClientGenerator) [nuget package](https://www.nuget.org/packages/NSwag.CodeGeneration.CSharp/) **v13.19.0**
 
-- ***OpenApiCodeGenerator*** - Generates a single file C# REST API Client using **[OpenAPI Generator v6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)**.
+- ***OpenApiCodeGenerator*** - Generates a single file C# REST API Client using **[OpenAPI Generator v7.0.0-beta](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.0.0-beta)**.
 The output file is the result of merging all the files generated using the OpenAPI Generator tool with:
 ` generate -g csharp --input-spec [swagger file] --output [output file] -DapiTests=false -DmodelTests=false -DpackageName=[default namespace] --skip-overwrite`
 
diff --git a/docs/VisualStudioForMac.md b/docs/VisualStudioForMac.md
index b1b7774bbf..138ecc3c25 100644
--- a/docs/VisualStudioForMac.md
+++ b/docs/VisualStudioForMac.md
@@ -22,7 +22,7 @@ The resulting file is the equivalent of using the AutoRest CLI tool with:
 The output file is the result of merging all the files generated using the Swagger Codegen CLI tool with:
 ` generate -l csharp --input-spec [swaggerFile] --output [output] -DapiTests=false -DmodelTests=false -DpackageName=[namespace] --skip-overwrite`
 
-- ***OpenApiCodeGenerator*** - Generates a single file C# REST API Client using **[OpenAPI Generator v6.6.0](https://github.com/OpenAPITools/openapi-generator/releases/tag/v6.6.0)**.
+- ***OpenApiCodeGenerator*** - Generates a single file C# REST API Client using **[OpenAPI Generator v7.0.0-beta](https://github.com/OpenAPITools/openapi-generator/releases/tag/v7.0.0-beta)**.
 The output file is the result of merging all the files generated using the OpenAPI Generator tool with:
 ` generate -g csharp --input-spec [swaggerFile] --output [output] -DapiTests=false -DmodelTests=false -DpackageName=[namespace] --skip-overwrite`
 
diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/OpenApiCSharpGeneratorCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/OpenApiCSharpGeneratorCommand.cs
index a00eb17cd7..230f6177db 100644
--- a/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/OpenApiCSharpGeneratorCommand.cs
+++ b/src/CLI/ApiClientCodeGen.CLI/Commands/CSharp/OpenApiCSharpGeneratorCommand.cs
@@ -9,7 +9,7 @@
 
 namespace Rapicgen.CLI.Commands.CSharp
 {
-    [Command("openapi", Description = "OpenAPI Generator (v6.6.0)")]
+    [Command("openapi", Description = "OpenAPI Generator (v7.0.0-beta)")]
     public class OpenApiCSharpGeneratorCommand : CodeGeneratorCommand, IOpenApiGeneratorOptions
     {
         private readonly IGeneralOptions options;
diff --git a/src/CLI/ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs b/src/CLI/ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs
index 66e49ab058..ff924a698d 100644
--- a/src/CLI/ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs
+++ b/src/CLI/ApiClientCodeGen.CLI/Commands/OpenApiGeneratorCommand.cs
@@ -15,7 +15,7 @@ namespace Rapicgen.CLI.Commands
     [Command(
         "openapi-generator", 
         Description = 
-            @"Generate code using OpenAPI Generator (v6.6.0). 
+            @"Generate code using OpenAPI Generator (v7.0.0-beta). 
 See supported generators at https://openapi-generator.tech/docs/generators/")]
     public class OpenApiGeneratorCommand
     {
diff --git a/src/Core/ApiClientCodeGen.Core/Generators/OpenApi/OpenApiCSharpCodeGenerator.cs b/src/Core/ApiClientCodeGen.Core/Generators/OpenApi/OpenApiCSharpCodeGenerator.cs
index c89ea9d4be..0a4c5eb5f4 100644
--- a/src/Core/ApiClientCodeGen.Core/Generators/OpenApi/OpenApiCSharpCodeGenerator.cs
+++ b/src/Core/ApiClientCodeGen.Core/Generators/OpenApi/OpenApiCSharpCodeGenerator.cs
@@ -113,7 +113,7 @@ public string GenerateCode(IProgressReporter? pGenerateProgress)
                 return GeneratedCode.PrefixAutogeneratedCodeHeader(
                     CSharpFileMerger.MergeFilesAndDeleteSource(output),
                     "OpenAPI Generator",
-                    "v6.6.0");
+                    "v7.0.0-beta");
             }
             finally
             {
diff --git a/src/Core/ApiClientCodeGen.Core/Resource.Designer.cs b/src/Core/ApiClientCodeGen.Core/Resource.Designer.cs
index 5ca9dc9de1..14ec7ff2e4 100644
--- a/src/Core/ApiClientCodeGen.Core/Resource.Designer.cs
+++ b/src/Core/ApiClientCodeGen.Core/Resource.Designer.cs
@@ -60,7 +60,7 @@ internal Resource() {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.0.1/openapi-generator-cli-6.0.1.jar.
+        ///   Looks up a localized string similar to https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0-beta/openapi-generator-cli-7.0.0-beta.jar.
         /// </summary>
         public static string LegacyOpenApiGenerator_DownloadUrl {
             get {
@@ -69,7 +69,7 @@ public static string LegacyOpenApiGenerator_DownloadUrl {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to ACE9D0D6F89AFED9EED414DCB3736DFABC911B77.
+        ///   Looks up a localized string similar to 42FBFF2C650504C5DCCA8246C0463C609AEF7AE1.
         /// </summary>
         public static string LegacyOpenApiGenerator_SHA1 {
             get {
diff --git a/src/Core/ApiClientCodeGen.Core/Resource.resx b/src/Core/ApiClientCodeGen.Core/Resource.resx
index f9f1998218..b95298019c 100644
--- a/src/Core/ApiClientCodeGen.Core/Resource.resx
+++ b/src/Core/ApiClientCodeGen.Core/Resource.resx
@@ -136,9 +136,9 @@
     <value>54EB5F2561C77D23AF3FA2E4CEA8A100BA8F71C8</value>
   </data>
   <data name="LegacyOpenApiGenerator_DownloadUrl" xml:space="preserve">
-    <value>https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.0.1/openapi-generator-cli-6.0.1.jar</value>
+    <value>https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/7.0.0-beta/openapi-generator-cli-7.0.0-beta.jar</value>
   </data>
   <data name="LegacyOpenApiGenerator_SHA1" xml:space="preserve">
-    <value>ACE9D0D6F89AFED9EED414DCB3736DFABC911B77</value>
+    <value>42FBFF2C650504C5DCCA8246C0463C609AEF7AE1</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct b/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct
index 1d3e5c4a28..7203f30b4d 100644
--- a/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct
+++ b/src/VSIX/ApiClientCodeGen.VSIX.Dev17/VSCommandTable.vsct
@@ -39,7 +39,7 @@
       </Button>
       <Button guid="guidPackageCmdSet" id="OpenApiCodeGeneratorCustomToolSetter" priority="0x0101" type="Button">
         <Strings>
-          <ButtonText>Generate with OpenAPI Generator (v6.6.0)</ButtonText>
+          <ButtonText>Generate with OpenAPI Generator (v7.0.0-beta)</ButtonText>
         </Strings>
       </Button>
       <Button guid="guidPackageCmdSet" id="KiotaCodeGeneratorCustomToolSetter" priority="0x0102" type="Button">
@@ -83,7 +83,7 @@
       </Button>
       <Button guid="guidNewRestApiClientCmdSet" id="GenerateWithOpenApi" priority="0x0102" type="Button">
         <Strings>
-          <ButtonText>Generate with OpenAPI Generator (v6.6.0)</ButtonText>
+          <ButtonText>Generate with OpenAPI Generator (v7.0.0-beta)</ButtonText>
         </Strings>
       </Button>
       <Button guid="guidNewRestApiClientCmdSet" id="GenerateWithKiota" priority="0x0103" type="Button">
diff --git a/src/VSIX/ApiClientCodeGen.VSIX/VSCommandTable.vsct b/src/VSIX/ApiClientCodeGen.VSIX/VSCommandTable.vsct
index 1d3e5c4a28..7203f30b4d 100644
--- a/src/VSIX/ApiClientCodeGen.VSIX/VSCommandTable.vsct
+++ b/src/VSIX/ApiClientCodeGen.VSIX/VSCommandTable.vsct
@@ -39,7 +39,7 @@
       </Button>
       <Button guid="guidPackageCmdSet" id="OpenApiCodeGeneratorCustomToolSetter" priority="0x0101" type="Button">
         <Strings>
-          <ButtonText>Generate with OpenAPI Generator (v6.6.0)</ButtonText>
+          <ButtonText>Generate with OpenAPI Generator (v7.0.0-beta)</ButtonText>
         </Strings>
       </Button>
       <Button guid="guidPackageCmdSet" id="KiotaCodeGeneratorCustomToolSetter" priority="0x0102" type="Button">
@@ -83,7 +83,7 @@
       </Button>
       <Button guid="guidNewRestApiClientCmdSet" id="GenerateWithOpenApi" priority="0x0102" type="Button">
         <Strings>
-          <ButtonText>Generate with OpenAPI Generator (v6.6.0)</ButtonText>
+          <ButtonText>Generate with OpenAPI Generator (v7.0.0-beta)</ButtonText>
         </Strings>
       </Button>
       <Button guid="guidNewRestApiClientCmdSet" id="GenerateWithKiota" priority="0x0103" type="Button">
diff --git a/src/VSMac/ApiClientCodeGen.VSMac/Properties/Manifest.addin.xml b/src/VSMac/ApiClientCodeGen.VSMac/Properties/Manifest.addin.xml
index c9e68a94e6..a55e022dd0 100644
--- a/src/VSMac/ApiClientCodeGen.VSMac/Properties/Manifest.addin.xml
+++ b/src/VSMac/ApiClientCodeGen.VSMac/Properties/Manifest.addin.xml
@@ -35,7 +35,7 @@
                  defaultHandler="ApiClientCodeGen.VSMac.Commands.Handlers.AddNewNSwagStudioCommandHandler" />
 
         <Command id = "ApiClientCodeGen.VSMac.Commands.AddToProject.OpenApi"
-                 _label = "Generate with OpenAPI Generator (v6.6.0)"
+                 _label = "Generate with OpenAPI Generator (v7.0.0-beta)"
                  defaultHandler="ApiClientCodeGen.VSMac.Commands.Handlers.AddNewOpenApiCommandHandler" />
 
         <Command id = "ApiClientCodeGen.VSMac.Commands.AddToProject.Kiota"
@@ -64,7 +64,7 @@
                  defaultHandler="ApiClientCodeGen.VSMac.Commands.Handlers.GenerateNSwagStudioCommandHandler" />
 
         <Command id = "ApiClientCodeGen.VSMac.Commands.GenerateCode.OpenApi"
-                 _label = "Generate with OpenAPI Generator (v6.6.0)"
+                 _label = "Generate with OpenAPI Generator (v7.0.0-beta)"
                  defaultHandler="ApiClientCodeGen.VSMac.Commands.Handlers.GenerateOpenApiCommandHandler" />
 
         <Command id = "ApiClientCodeGen.VSMac.Commands.GenerateCode.Kiota"