diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Startup.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Startup.mustache
index e3701048a27..d2f6997dd71 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Startup.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Startup.mustache
@@ -123,12 +123,14 @@ namespace {{packageName}}
 
                     //TODO: Or alternatively use the original Swagger contract that's included in the static files
                     // c.SwaggerEndpoint("/openapi-original.json", "{{#appName}}{{{appName}}}{{/appName}}{{^appName}}{{packageName}}{{/appName}} Original");
-                }){{/useSwashbuckle}};{{^useDefaultRouting}}
+                }){{/useSwashbuckle}};
+            {{^useDefaultRouting}}
             app.UseRouting();
             app.UseEndpoints(endpoints =>
-	            {
-	    	        endpoints.MapControllers();
-	            });{{/useDefaultRouting}}
+                {
+                    endpoints.MapControllers();
+                });
+            {{/useDefaultRouting}}
 
             if (env.IsDevelopment())
             {
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache
index a936378d65b..47e36aa25b6 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/controller.mustache
@@ -49,7 +49,7 @@ namespace {{apiPackage}}
         public {{operationModifier}} {{#operationResultTask}}{{#operationIsAsync}}async {{/operationIsAsync}}Task<{{/operationResultTask}}IActionResult{{#operationResultTask}}>{{/operationResultTask}} {{operationId}}({{#allParams}}{{>pathParam}}{{>queryParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{^-last}}{{^isCookieParam}}, {{/isCookieParam}}{{/-last}}{{/allParams}}){{^generateBody}};{{/generateBody}}
         {{#generateBody}}
         { 
-	    {{#cookieParams}} 
+            {{#cookieParams}}
             var {{paramName}} = Request.Cookies["{{paramName}}"];
             {{/cookieParams}}
 
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache
index 88f75350098..6b8fd56ff9f 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Startup.mustache
@@ -155,9 +155,9 @@ namespace {{packageName}}
                 }){{/useSwashbuckle}};
             app.UseRouting();
             app.UseEndpoints(endpoints =>
-	            {
-	    	        endpoints.MapControllers();
-	            });
+                {
+                    endpoints.MapControllers();
+                });
         }
     }
 }
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache
index 089e415671a..73e6e4fa9ad 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/controller.mustache
@@ -49,7 +49,7 @@ namespace {{apiPackage}}
         public {{operationModifier}} {{#operationResultTask}}{{#operationIsAsync}}async {{/operationIsAsync}}Task<{{/operationResultTask}}IActionResult{{#operationResultTask}}>{{/operationResultTask}} {{operationId}}({{#allParams}}{{>pathParam}}{{>queryParam}}{{>bodyParam}}{{>formParam}}{{>headerParam}}{{^-last}}{{^isCookieParam}}, {{/isCookieParam}}{{/-last}}{{/allParams}}){{^generateBody}};{{/generateBody}}
         {{#generateBody}}
         { 
-	    {{#cookieParams}} 
+            {{#cookieParams}}
             var {{paramName}} = Request.Cookies["{{paramName}}"];
             {{/cookieParams}}
 
diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Startup.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Startup.cs
index a6c96e4a2f9..18b637c1a54 100644
--- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Startup.cs
+++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Startup.cs
@@ -143,9 +143,9 @@ namespace Org.OpenAPITools
                 });
             app.UseRouting();
             app.UseEndpoints(endpoints =>
-	            {
-	    	        endpoints.MapControllers();
-	            });
+                {
+                    endpoints.MapControllers();
+                });
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Startup.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Startup.cs
index dea163f2601..43b52c331bc 100644
--- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Startup.cs
+++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Startup.cs
@@ -143,9 +143,9 @@ namespace Org.OpenAPITools
                 });
             app.UseRouting();
             app.UseEndpoints(endpoints =>
-	            {
-	    	        endpoints.MapControllers();
-	            });
+                {
+                    endpoints.MapControllers();
+                });
         }
     }
 }
diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Startup.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Startup.cs
index f55e9f010bf..2d3b6e7fe70 100644
--- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Startup.cs
+++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Startup.cs
@@ -143,9 +143,9 @@ namespace Org.OpenAPITools
                 });
             app.UseRouting();
             app.UseEndpoints(endpoints =>
-	            {
-	    	        endpoints.MapControllers();
-	            });
+                {
+                    endpoints.MapControllers();
+                });
         }
     }
 }