diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml
index fc27955..5449517 100644
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -1,62 +1,31 @@
-name: Deploy and release
+name: Upload Python Package
 
 on:
-  push:
-    tags:
-    - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+  release:
+    types: [published]
+
+permissions:
+  contents: read
 
 jobs:
   deploy:
+
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
         python-version: '3.x'
-    - name: Get the version (git tag)
-      id: get_version
-      run: |
-        echo ${GITHUB_REF/refs\/tags\/v/}
-        echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install setuptools wheel
-    - name: Build
-      run: |
-        python setup.py sdist bdist_wheel
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1.0.0
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ github.ref }}
-        draft: false
-        prerelease: false
-    - name: Upload Release Asset (Wheel)
-      id: upload-release-asset-whl
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./dist/asreview_makita-${{ steps.get_version.outputs.VERSION }}-py3-none-any.whl
-        asset_name: asreview_makita-${{ steps.get_version.outputs.VERSION }}-py3-none-any.whl
-        asset_content_type: application/x-wheel+zip
-    - name: Upload Release Asset (Sdist)
-      id: upload-release-asset-sdist
-      uses: actions/upload-release-asset@v1.0.1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./dist/asreview-makita-${{ steps.get_version.outputs.VERSION }}.tar.gz
-        asset_name: asreview-makita-${{ steps.get_version.outputs.VERSION }}.tar.gz
-        asset_content_type: application/zip
+        pip install build
+    - name: Build package
+      run: python -m build
     - name: Publish package
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
+        user: __token__
         password: ${{ secrets.PYPI_MSDSLAB_API_TOKEN }}