diff --git a/.github/workflows/poetry-build.yaml b/.github/workflows/poetry-build.yaml
deleted file mode 100644
index b604e43..0000000
--- a/.github/workflows/poetry-build.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Poetry Build
-
-on:
-  pull_request:
-
-jobs:
-  poetry-build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out
-        uses: actions/checkout@v4
-
-      - name: Install poetry
-        run: pipx install poetry
-
-      - run: poetry build
diff --git a/.github/workflows/pypi-publish.yaml b/.github/workflows/pypi-publish.yaml
index b594906..ba77c07 100644
--- a/.github/workflows/pypi-publish.yaml
+++ b/.github/workflows/pypi-publish.yaml
@@ -1,17 +1,50 @@
-name: PyPI Publish
+name: PyPI Packaging
 
 on:
   push:
     tags:
       - "v*.*.*"
+  pull_request:
 
 jobs:
-  poetry-publish:
+  build:
     runs-on: ubuntu-latest
-    environment: release
     steps:
-      - uses: actions/checkout@v3
+      - name: Check out
+        uses: actions/checkout@v4
 
-      - uses: JRubics/poetry-publish@v1.16
+      - name: Install poetry
+        run: pipx install poetry
+
+      - name: Build package
+        run: poetry build -vvv
+
+      - uses: actions/upload-artifact@v4
         with:
-          pypi_token: ${{ secrets.PYPI_TOKEN }}
+          name: package
+          path: |
+            README.md
+            pyproject.toml
+            dist/*
+          if-no-files-found: error
+        # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+
+  publish:
+    # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    # environment: release
+    needs: build
+    steps:
+      - name: Install poetry
+        run: pipx install poetry
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: package
+
+      - run: ls dist/*
+
+      - name: Publish package
+        run: poetry publish
+        env:
+          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}