diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 1473b7c9..eef1f9fd 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -96,7 +96,14 @@ jobs:
         tar -cvf ${{ matrix.UPLOAD_FILE_NAME }} ${{ matrix.OUT_FILE_NAME }}
 
 
+    - name: Upload build artifact for ${{ matrix.TARGET }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: tabcmd-${{ matrix.TARGET }}
+        path: ./dist/${{ matrix.TARGET }}/${{ matrix.UPLOAD_FILE_NAME }}
+
     - name: Upload binaries to release for ${{ matrix.TARGET }}
+      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/pyproject.toml b/pyproject.toml
index 65394984..3591b042 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ tabcmd = ["tabcmd.locales/**/*.mo"]
 [tool.black]
 line-length = 120
 required-version = 22
-target-version = ['py39', 'py310', 'py311']
+target-version = ['py310', 'py311']
 extend-exclude = '^/bin/*'
 [tool.mypy]
 disable_error_code = [
@@ -65,7 +65,7 @@ test = [
     "types-setuptools"
 ]
 localize = ["doit", "ftfy"]
-package = ["doit", "pyinstaller==5.13"]
+package = ["doit", "pyinstaller==5.13.1", "setuptools==81"]
 versioning = [
     "doit",
     "pyinstaller_versionfile",