diff --git a/modules/openapi-generator/src/main/resources/python/python_doc_auth_partial.mustache b/modules/openapi-generator/src/main/resources/python/python_doc_auth_partial.mustache
index 460c2df938..5106632d21 100644
--- a/modules/openapi-generator/src/main/resources/python/python_doc_auth_partial.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python_doc_auth_partial.mustache
@@ -92,12 +92,8 @@ configuration = {{{packageName}}}.Configuration(
 {{#isApiKey}}
 
 # Configure API key authorization: {{{name}}}
-configuration = {{{packageName}}}.Configuration(
-    host = "{{{basePath}}}",
-    api_key = {
-        '{{name}}': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['{{{name}}}'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['{{name}}'] = 'Bearer'
 {{/isApiKey}}
diff --git a/samples/client/petstore/python-asyncio/docs/FakeClassnameTags123Api.md b/samples/client/petstore/python-asyncio/docs/FakeClassnameTags123Api.md
index 5e1739a561..66b43fb1ea 100644
--- a/samples/client/petstore/python-asyncio/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/python-asyncio/docs/FakeClassnameTags123Api.md
@@ -35,12 +35,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key_query
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key_query': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
diff --git a/samples/client/petstore/python-asyncio/docs/PetApi.md b/samples/client/petstore/python-asyncio/docs/PetApi.md
index a07c55e726..e8176632d0 100644
--- a/samples/client/petstore/python-asyncio/docs/PetApi.md
+++ b/samples/client/petstore/python-asyncio/docs/PetApi.md
@@ -335,12 +335,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/client/petstore/python-asyncio/docs/StoreApi.md b/samples/client/petstore/python-asyncio/docs/StoreApi.md
index 8d5e2178ea..b9dc71c38f 100644
--- a/samples/client/petstore/python-asyncio/docs/StoreApi.md
+++ b/samples/client/petstore/python-asyncio/docs/StoreApi.md
@@ -100,12 +100,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md b/samples/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md
index 2aa0a68d0c..9bf5b1babf 100644
--- a/samples/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md
@@ -35,12 +35,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key_query
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key_query': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
diff --git a/samples/client/petstore/python-experimental/docs/PetApi.md b/samples/client/petstore/python-experimental/docs/PetApi.md
index f00dd3a664..6364be4483 100644
--- a/samples/client/petstore/python-experimental/docs/PetApi.md
+++ b/samples/client/petstore/python-experimental/docs/PetApi.md
@@ -368,12 +368,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/client/petstore/python-experimental/docs/StoreApi.md b/samples/client/petstore/python-experimental/docs/StoreApi.md
index b8065abf64..30ea16d661 100644
--- a/samples/client/petstore/python-experimental/docs/StoreApi.md
+++ b/samples/client/petstore/python-experimental/docs/StoreApi.md
@@ -99,12 +99,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/client/petstore/python-tornado/docs/FakeClassnameTags123Api.md b/samples/client/petstore/python-tornado/docs/FakeClassnameTags123Api.md
index 5e1739a561..66b43fb1ea 100644
--- a/samples/client/petstore/python-tornado/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/python-tornado/docs/FakeClassnameTags123Api.md
@@ -35,12 +35,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key_query
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key_query': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
diff --git a/samples/client/petstore/python-tornado/docs/PetApi.md b/samples/client/petstore/python-tornado/docs/PetApi.md
index a07c55e726..e8176632d0 100644
--- a/samples/client/petstore/python-tornado/docs/PetApi.md
+++ b/samples/client/petstore/python-tornado/docs/PetApi.md
@@ -335,12 +335,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/client/petstore/python-tornado/docs/StoreApi.md b/samples/client/petstore/python-tornado/docs/StoreApi.md
index 8d5e2178ea..b9dc71c38f 100644
--- a/samples/client/petstore/python-tornado/docs/StoreApi.md
+++ b/samples/client/petstore/python-tornado/docs/StoreApi.md
@@ -100,12 +100,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/client/petstore/python/docs/FakeClassnameTags123Api.md b/samples/client/petstore/python/docs/FakeClassnameTags123Api.md
index 5e1739a561..66b43fb1ea 100644
--- a/samples/client/petstore/python/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/python/docs/FakeClassnameTags123Api.md
@@ -35,12 +35,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key_query
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key_query': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
diff --git a/samples/client/petstore/python/docs/PetApi.md b/samples/client/petstore/python/docs/PetApi.md
index a07c55e726..e8176632d0 100644
--- a/samples/client/petstore/python/docs/PetApi.md
+++ b/samples/client/petstore/python/docs/PetApi.md
@@ -335,12 +335,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/client/petstore/python/docs/StoreApi.md b/samples/client/petstore/python/docs/StoreApi.md
index 8d5e2178ea..b9dc71c38f 100644
--- a/samples/client/petstore/python/docs/StoreApi.md
+++ b/samples/client/petstore/python/docs/StoreApi.md
@@ -100,12 +100,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/README.md b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/README.md
index 26830bc746..9fa46ab7a8 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/README.md
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/README.md
@@ -62,22 +62,14 @@ configuration = x_auth_id_alias.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = x_auth_id_alias.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
 # Configure API key authorization: api_key_query
-configuration = x_auth_id_alias.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key_query': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/docs/UsageApi.md b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/docs/UsageApi.md
index 1d6ecb0732..cf3a8e1910 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/docs/UsageApi.md
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python-experimental/docs/UsageApi.md
@@ -38,22 +38,14 @@ configuration = x_auth_id_alias.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = x_auth_id_alias.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
 # Configure API key authorization: api_key_query
-configuration = x_auth_id_alias.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key_query': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
@@ -122,22 +114,14 @@ configuration = x_auth_id_alias.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = x_auth_id_alias.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
 # Configure API key authorization: api_key_query
-configuration = x_auth_id_alias.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key_query': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
@@ -205,12 +189,8 @@ configuration = x_auth_id_alias.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = x_auth_id_alias.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
@@ -278,12 +258,8 @@ configuration = x_auth_id_alias.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key_query
-configuration = x_auth_id_alias.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key_query': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md
index 2f6730320c..e7a43d577d 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/FakeClassnameTags123Api.md
@@ -35,12 +35,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key_query
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key_query': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/PetApi.md b/samples/openapi3/client/petstore/python-experimental/docs/PetApi.md
index 5ba8114a4a..21323c72c9 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/PetApi.md
@@ -545,12 +545,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/StoreApi.md b/samples/openapi3/client/petstore/python-experimental/docs/StoreApi.md
index 5b5c30f276..c052c02c9b 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/StoreApi.md
@@ -99,12 +99,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md
index 822fd39ace..1b02ad93ef 100644
--- a/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md
+++ b/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md
@@ -35,12 +35,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key_query
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key_query': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key_query'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key_query'] = 'Bearer'
 
diff --git a/samples/openapi3/client/petstore/python/docs/PetApi.md b/samples/openapi3/client/petstore/python/docs/PetApi.md
index d64a86236a..186933485e 100644
--- a/samples/openapi3/client/petstore/python/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/python/docs/PetApi.md
@@ -333,12 +333,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'
 
diff --git a/samples/openapi3/client/petstore/python/docs/StoreApi.md b/samples/openapi3/client/petstore/python/docs/StoreApi.md
index 3e6cc02faa..6704d5844b 100644
--- a/samples/openapi3/client/petstore/python/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/python/docs/StoreApi.md
@@ -100,12 +100,8 @@ configuration = petstore_api.Configuration(
 # satisfies your auth use case.
 
 # Configure API key authorization: api_key
-configuration = petstore_api.Configuration(
-    host = "http://petstore.swagger.io:80/v2",
-    api_key = {
-        'api_key': 'YOUR_API_KEY'
-    }
-)
+configuration.api_key['api_key'] = 'YOUR_API_KEY'
+
 # Uncomment below to setup prefix (e.g. Bearer) for API key, if needed
 # configuration.api_key_prefix['api_key'] = 'Bearer'