diff --git a/.github/workflows/publish-apishell.yml b/.github/workflows/publish-apishell.yml
index 1a76312..b798254 100644
--- a/.github/workflows/publish-apishell.yml
+++ b/.github/workflows/publish-apishell.yml
@@ -6,7 +6,7 @@
 # separate terms of service, privacy policy, and support
 # documentation.
 
-name: Upload Python Package
+name: Upload Python Package to PyPi
 
 on:
   release:
@@ -40,15 +40,14 @@ jobs:
         name: python-package-distributions
         path: dist/
 
-  publish-to-testpypi:
-    name: Publish Python distro to TestPyPi
+  publish-to-pypi:
+    name: Publish Python distro to PyPi
     needs:
     - build
     runs-on: ubuntu-latest
 
     environment:
-      name: testpypi
-      url: https://test.pypi.org/project/iriusrisk-apishell-v1/
+      name: pypi
 
     permissions:
       id-token: write
@@ -59,7 +58,5 @@ jobs:
       with:
         name: python-package-distributions
         path: dist/
-    - name: Publish distribution to TestPyPi
+    - name: Publish distribution to PyPi
       uses: pypa/gh-action-pypi-publish@release/v1
-      with:
-        repository-url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/publish-test-apishell.yml b/.github/workflows/publish-test-apishell.yml
new file mode 100644
index 0000000..b2d3bbc
--- /dev/null
+++ b/.github/workflows/publish-test-apishell.yml
@@ -0,0 +1,65 @@
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Upload Python Package to Test PyPi
+
+on:
+  release:
+    types: [prepublished]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Build distribution
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: "3.x"
+    - name: Install pypa/build
+      run: >-
+        python3 -m
+        pip install
+        build
+        --user
+    - name: Build a binary wheel and source tarball
+      run: python3 -m build Integrations/ApiShell/ --outdir dist
+    - name: Store the distribution packages
+      uses: actions/upload-artifact@v3
+      with:
+        name: python-package-distributions
+        path: dist/
+
+  publish-to-testpypi:
+    name: Publish Python distro to TestPyPi
+    needs:
+    - build
+    runs-on: ubuntu-latest
+
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/project/iriusrisk-apishell-v1/
+
+    permissions:
+      id-token: write
+
+    steps:
+    - name: Download all the dists
+      uses: actions/download-artifact@v3
+      with:
+        name: python-package-distributions
+        path: dist/
+    - name: Publish distribution to TestPyPi
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        repository-url: https://test.pypi.org/legacy/