diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 9e41da5..80ac0b7 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: publish-testpypi
+name: publish-pypi
 
 on:
   release:
@@ -69,6 +69,8 @@ jobs:
     needs: sync-changelog
     permissions:
       contents: read
+    outputs:
+      package: ${{ steps.meta.outputs.package }}
     steps:
       - name: Get package from tag
         id: meta
@@ -96,11 +98,11 @@ jobs:
           path: packages/${{ steps.meta.outputs.package }}/dist/
 
   publish-pypi:
-    name: Publish to TestPyPI
+    name: Publish to PyPI
     runs-on: ubuntu-latest
     needs: build
     environment:
-      name: pypi:sap-ai-sdk-gen
+      name: pypi:sap-ai-sdk-${{ needs.build.outputs.package }}
     permissions:
       id-token: write
     steps:
@@ -110,9 +112,8 @@ jobs:
           name: dist
           path: dist/
 
-      - name: Publish package distributions to TestPyPI
+      - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@dc37677b2e1c63e2034f94d8a5b11f265b73ba33 # v1.14.2
         with:
-          repository-url: https://test.pypi.org/legacy/
           skip-existing: false
           packages-dir: dist/