diff --git a/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache b/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache
index af3b379c628..22b4ef93753 100644
--- a/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache
+++ b/modules/openapi-generator/src/main/resources/python-nextgen/pyproject.mustache
@@ -5,7 +5,7 @@ description = "{{{appName}}}"
 authors = ["{{infoName}}{{^infoName}}OpenAPI Generator Community{{/infoName}} <{{infoEmail}}{{^infoEmail}}team@openapitools.org{{/infoEmail}}>"]
 license = "{{{licenseInfo}}}{{^licenseInfo}}NoLicense{{/licenseInfo}}"
 readme = "README.md"
-repository = "https://github.com/{{{gitRepoId}}}/{{{gitUserId}}}"
+repository = "https://github.com/{{{gitUserId}}}/{{{gitRepoId}}}"
 keywords = ["OpenAPI", "OpenAPI-Generator", "{{{appName}}}"]
 
 [tool.poetry.dependencies]
diff --git a/samples/client/echo_api/python-nextgen/pyproject.toml b/samples/client/echo_api/python-nextgen/pyproject.toml
index 2be7cdbbec6..7307845b60a 100644
--- a/samples/client/echo_api/python-nextgen/pyproject.toml
+++ b/samples/client/echo_api/python-nextgen/pyproject.toml
@@ -5,7 +5,7 @@ description = "Echo Server API"
 authors = ["OpenAPI Generator Community <team@openapitools.org>"]
 license = "Apache 2.0"
 readme = "README.md"
-repository = "https://github.com/GIT_REPO_ID/GIT_USER_ID"
+repository = "https://github.com/GIT_USER_ID/GIT_REPO_ID"
 keywords = ["OpenAPI", "OpenAPI-Generator", "Echo Server API"]
 
 [tool.poetry.dependencies]
diff --git a/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml b/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml
index 70ac4c13846..785cf14a36a 100644
--- a/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml
+++ b/samples/openapi3/client/petstore/python-nextgen-aiohttp/pyproject.toml
@@ -5,7 +5,7 @@ description = "OpenAPI Petstore"
 authors = ["OpenAPI Generator Community <team@openapitools.org>"]
 license = "Apache-2.0"
 readme = "README.md"
-repository = "https://github.com/GIT_REPO_ID/GIT_USER_ID"
+repository = "https://github.com/GIT_USER_ID/GIT_REPO_ID"
 keywords = ["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"]
 
 [tool.poetry.dependencies]
diff --git a/samples/openapi3/client/petstore/python-nextgen/pyproject.toml b/samples/openapi3/client/petstore/python-nextgen/pyproject.toml
index ed6bee8c6b8..f0c3fa39249 100644
--- a/samples/openapi3/client/petstore/python-nextgen/pyproject.toml
+++ b/samples/openapi3/client/petstore/python-nextgen/pyproject.toml
@@ -5,7 +5,7 @@ description = "OpenAPI Petstore"
 authors = ["OpenAPI Generator Community <team@openapitools.org>"]
 license = "Apache-2.0"
 readme = "README.md"
-repository = "https://github.com/GIT_REPO_ID/GIT_USER_ID"
+repository = "https://github.com/GIT_USER_ID/GIT_REPO_ID"
 keywords = ["OpenAPI", "OpenAPI-Generator", "OpenAPI Petstore"]
 
 [tool.poetry.dependencies]