diff --git a/.github/workflows/pre_release.yml b/.github/workflows/pre_release.yml
new file mode 100644
index 00000000..a9fe34ab
--- /dev/null
+++ b/.github/workflows/pre_release.yml
@@ -0,0 +1,55 @@
+name: Build and Publish pre-release
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  pre_release:
+    name: Pre-Release
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      id-token: write
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.7'
+
+    - name: Install Poetry
+      run: |
+        curl -sSL https://install.python-poetry.org | python - -y
+
+    - name: Update PATH
+      run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+    - name: Install Poetry Plugin
+      run: poetry self add "poetry-dynamic-versioning[plugin]"
+
+    - name: Check Pre-Release Version
+      id: check-version
+      run: |
+        echo "::debug::Package version: $(poetry version --short)"
+        [[ "$(poetry version --short)" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || echo prerelease=true >> $GITHUB_OUTPUT
+
+    - name: Exit if not Pre-Release Version
+      if: steps.check-version.outputs.prerelease != 'true'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        gh run cancel ${{ github.run_id }}
+        gh run watch ${{ github.run_id }}
+
+    - name: Build package
+      run: poetry build
+
+    - name: Publish a Python distribution to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
deleted file mode 100644
index 745c220e..00000000
--- a/.github/workflows/python-publish.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-# This workflows will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
-
-name: Upload Python Package
-
-on:
-  release:
-    types: [created]
-
-permissions:
-  contents: read
-
-jobs:
-  deploy:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
-    - name: Clean cache
-      run: |
-        python setup.py clean --all
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python setup.py sdist bdist_wheel
-        twine upload dist/*