diff --git a/.github/workflows/python-app.yml b/.github/workflows/github_test.yml
similarity index 94%
rename from .github/workflows/python-app.yml
rename to .github/workflows/github_test.yml
index e99f354..947449f 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/github_test.yml
@@ -1,7 +1,8 @@
 # This workflow will install Python dependencies, run tests and lint with a single version of Python
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
 
-name: Python application
+name: GitHub Unit Testing
+run-name: Unit Testing on ${{ github.event_name }}
 
 on:
   push:
diff --git a/.github/workflows/upload_pypi.yml b/.github/workflows/upload_pypi.yml
new file mode 100644
index 0000000..eef2a4f
--- /dev/null
+++ b/.github/workflows/upload_pypi.yml
@@ -0,0 +1,45 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Upload PyPI
+run-name: Upload ${{ github.event.release.tag_name }} to PyPI
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: write
+  id-token: write
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+        cache: 'pip'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install flake8 twine sdist wheel build
+    - name: Install text2term
+      run: |
+        pip install -e .
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Build dist/
+      run: |
+        python -m build --sdist --wheel --no-isolation --outdir dist/ .
+    - name: Upload to pypi
+      uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/upload_testpypi.yml b/.github/workflows/upload_testpypi.yml
new file mode 100644
index 0000000..82fec26
--- /dev/null
+++ b/.github/workflows/upload_testpypi.yml
@@ -0,0 +1,47 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Upload Test PyPI
+run-name: Upload ${{ github.event.release.tag_name }} to Test PyPI
+
+on:
+  release:
+    types: [published]
+
+permissions:
+  contents: write
+  id-token: write
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+        cache: 'pip'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install flake8 twine sdist wheel build
+    - name: Install text2term
+      run: |
+        pip install -e .
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Build dist/
+      run: |
+        python -m build --sdist --wheel --no-isolation --outdir dist/ .
+    - name: Upload to pypi
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        repository-url: https://test.pypi.org/legacy/