diff --git a/.github/workflows/build_wailord.yml b/.github/workflows/build_wailord.yml
index 418f35c..fe45c81 100644
--- a/.github/workflows/build_wailord.yml
+++ b/.github/workflows/build_wailord.yml
@@ -1,4 +1,4 @@
-name: "Build & Distribute"
+name: "Build & Test"
 on: [push, pull_request]
 jobs:
   ci:
@@ -24,14 +24,3 @@ jobs:
         run: poetry run pytest
       - name: Build project
         run: poetry build
-      - name: Publish distribution 📦 to Test PyPI
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        run: poetry run twine upload --non-interactive -r testpypi dist/*
-      - name: Publish distribution 📦 to PyPI
-        if: startsWith(github.ref, 'refs/tags')
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
-        run: poetry run twine upload --non-interactive -r pypi dist/*
diff --git a/.github/workflows/twine_uploader.yml b/.github/workflows/twine_uploader.yml
new file mode 100644
index 0000000..3f49592
--- /dev/null
+++ b/.github/workflows/twine_uploader.yml
@@ -0,0 +1,38 @@
+name: "Upload"
+on: [push, pull_request]
+jobs:
+  ci:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.8, 3.9]
+        poetry-version: [1.0, 1.1.2]
+        os: [ubuntu-18.04, macos-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Run image
+        uses: abatilo/actions-poetry@v2.0.0
+        with:
+          poetry-version: ${{ matrix.poetry-version }}
+      - name: Prep dependencies
+        run: poetry add twine && poetry install
+      - name: Test project
+        run: poetry run pytest
+      - name: Build project
+        run: poetry build
+      - name: Publish distribution 📦 to Test PyPI
+        if: startsWith(github.ref, 'refs/tags')
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
+        run: poetry run twine upload --non-interactive -r testpypi dist/*
+      - name: Publish distribution 📦 to PyPI
+        if: startsWith(github.ref, 'refs/tags')
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
+        run: poetry run twine upload --non-interactive -r pypi dist/*