diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache
index 80006ded1608..bf9ffe07d08d 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/setup.mustache
@@ -29,14 +29,16 @@ setup(
     name=NAME,
     version=VERSION,
     description="{{appName}}",
-    author_email="{{infoEmail}}",
+    author="{{#infoName}}{{infoName}}{{/infoName}}{{^infoName}}OpenAPI Generator community{{/infoName}}",
+    author_email="{{#infoEmail}}{{infoEmail}}{{/infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}",
     url="{{packageUrl}}",
     keywords=["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"],
     install_requires=REQUIRES,
     extras_require=EXTRAS,
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,
-    long_description="""\
+    {{#licenseInfo}}license="{{licenseInfo}}",
+    {{/licenseInfo}}long_description="""\
     {{appDescription}}  # noqa: E501
     """
 )
diff --git a/modules/openapi-generator/src/main/resources/python/setup.mustache b/modules/openapi-generator/src/main/resources/python/setup.mustache
index 588851cc7b0a..a41fee146742 100644
--- a/modules/openapi-generator/src/main/resources/python/setup.mustache
+++ b/modules/openapi-generator/src/main/resources/python/setup.mustache
@@ -28,13 +28,15 @@ setup(
     name=NAME,
     version=VERSION,
     description="{{appName}}",
-    author_email="{{infoEmail}}",
+    author="{{#infoName}}{{infoName}}{{/infoName}}{{^infoName}}OpenAPI Generator community{{/infoName}}",
+    author_email="{{#infoEmail}}{{infoEmail}}{{/infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}",
     url="{{packageUrl}}",
     keywords=["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"],
     install_requires=REQUIRES,
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,
-    long_description="""\
+    {{#licenseInfo}}license="{{licenseInfo}}",
+    {{/licenseInfo}}long_description="""\
     {{appDescription}}  # noqa: E501
     """
 )
diff --git a/samples/client/petstore/python-asyncio/setup.py b/samples/client/petstore/python-asyncio/setup.py
index bf6cb115fc6f..beeac0aae7f1 100644
--- a/samples/client/petstore/python-asyncio/setup.py
+++ b/samples/client/petstore/python-asyncio/setup.py
@@ -28,12 +28,14 @@
     name=NAME,
     version=VERSION,
     description="OpenAPI Petstore",
-    author_email="",
+    author="OpenAPI Generator community",
+    author_email="team@openapitools.org",
     url="",
     keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"],
     install_requires=REQUIRES,
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,
+    license="Apache-2.0",
     long_description="""\
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
     """
diff --git a/samples/client/petstore/python-experimental/setup.py b/samples/client/petstore/python-experimental/setup.py
index bb88f06e4e4f..f99ea80ad637 100644
--- a/samples/client/petstore/python-experimental/setup.py
+++ b/samples/client/petstore/python-experimental/setup.py
@@ -28,13 +28,15 @@
     name=NAME,
     version=VERSION,
     description="OpenAPI Petstore",
-    author_email="",
+    author="OpenAPI Generator community",
+    author_email="team@openapitools.org",
     url="",
     keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"],
     install_requires=REQUIRES,
     extras_require=EXTRAS,
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,
+    license="Apache-2.0",
     long_description="""\
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
     """
diff --git a/samples/client/petstore/python-tornado/setup.py b/samples/client/petstore/python-tornado/setup.py
index 6ed0ebf50092..921be1b7eae5 100644
--- a/samples/client/petstore/python-tornado/setup.py
+++ b/samples/client/petstore/python-tornado/setup.py
@@ -28,12 +28,14 @@
     name=NAME,
     version=VERSION,
     description="OpenAPI Petstore",
-    author_email="",
+    author="OpenAPI Generator community",
+    author_email="team@openapitools.org",
     url="",
     keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"],
     install_requires=REQUIRES,
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,
+    license="Apache-2.0",
     long_description="""\
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
     """
diff --git a/samples/client/petstore/python/setup.py b/samples/client/petstore/python/setup.py
index 1d5e7c2915ef..2a3ca48e06ba 100644
--- a/samples/client/petstore/python/setup.py
+++ b/samples/client/petstore/python/setup.py
@@ -27,12 +27,14 @@
     name=NAME,
     version=VERSION,
     description="OpenAPI Petstore",
-    author_email="",
+    author="OpenAPI Generator community",
+    author_email="team@openapitools.org",
     url="",
     keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"],
     install_requires=REQUIRES,
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,
+    license="Apache-2.0",
     long_description="""\
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
     """
diff --git a/samples/openapi3/client/petstore/python/setup.py b/samples/openapi3/client/petstore/python/setup.py
index 1d5e7c2915ef..2a3ca48e06ba 100644
--- a/samples/openapi3/client/petstore/python/setup.py
+++ b/samples/openapi3/client/petstore/python/setup.py
@@ -27,12 +27,14 @@
     name=NAME,
     version=VERSION,
     description="OpenAPI Petstore",
-    author_email="",
+    author="OpenAPI Generator community",
+    author_email="team@openapitools.org",
     url="",
     keywords=["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"],
     install_requires=REQUIRES,
     packages=find_packages(exclude=["test", "tests"]),
     include_package_data=True,
+    license="Apache-2.0",
     long_description="""\
     This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
     """