diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6a7fc28..c0e86c4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,11 +2,7 @@ name: release
 
 on:
   push:
-    branches:
-      - '*'
-  pull_request:
-    branches:
-      - '*'
+
 env:
   CACHE_VERSION: 4
   DEBIAN_FRONTEND: noninteractive
@@ -45,6 +41,15 @@ jobs:
       with:
         name: jack2-macOS-intel-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
         path: PawPaw/jack2-macOS-*.tar.gz
+    - uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        tag_name: ${{ github.ref_name }}
+        name: ${{ github.ref_name }}
+        draft: false
+        prerelease: false
+        files: |
+          path: PawPaw/jack2-macOS-*.tar.gz
 
   # macOS native universal build
   macos_universal:
@@ -81,6 +86,15 @@ jobs:
       with:
         name: jack2-macOS-universal-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
         path: PawPaw/jack2-macOS-*.tar.gz
+    - uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        tag_name: ${{ github.ref_name }}
+        name: ${{ github.ref_name }}
+        draft: false
+        prerelease: false
+        files: |
+          path: PawPaw/jack2-macOS-*.tar.gz
 
   # linux with win32 cross-compilation
   win32:
@@ -130,6 +144,15 @@ jobs:
       with:
         name: jack2-win32-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
         path: PawPaw/jack2-win*.exe
+    - uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        tag_name: ${{ github.ref_name }}
+        name: ${{ github.ref_name }}
+        draft: false
+        prerelease: false
+        files: |
+          path: PawPaw/jack2-win*.exe
 
   # linux with win64 cross-compilation
   win64:
@@ -179,3 +202,12 @@ jobs:
       with:
         name: jack2-win64-${{ github.event.pull_request.number || steps.slug.outputs.sha8 }}
         path: PawPaw/jack2-win*.exe
+    - uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        tag_name: ${{ github.ref_name }}
+        name: ${{ github.ref_name }}
+        draft: false
+        prerelease: false
+        files: |
+          path: PawPaw/jack2-win*.exe
diff --git a/PawPaw b/PawPaw
index c374904..40c378c 160000
--- a/PawPaw
+++ b/PawPaw
@@ -1 +1 @@
-Subproject commit c37490457b3b9a8183d99145ab0cbf8921da03a8
+Subproject commit 40c378c63d799b2dc3a71410bc515a493ebe2488
diff --git a/pack-jack2-version.sh b/pack-jack2-version.sh
index 595aa2f..710b951 100755
--- a/pack-jack2-version.sh
+++ b/pack-jack2-version.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export JACK2_VERSION=84d80c0a8c4f62839995ff96ad2b00d3ffed6211
+export JACK2_VERSION=1abd04edab2fef8e7b5e5197dd03034358a37078
 export QJACKCTL_VERSION=0.9.7
 
 set -e
@@ -26,6 +26,12 @@ rm -rf ~/PawPawBuilds/builds/*/qjackctl-${QJACKCTL_VERSION}
 # ---------------------------------------------------------------------------------------------------------------------
 
 ./PawPaw/build-jack2.sh ${target}
+
+# FIXME remove this on 1.9.22
+ln -s ~/PawPawBuilds/builds/${target}/jack2-${JACK2_VERSION} PawPaw/jack2
+ln -s ~/PawPawBuilds/builds/${target}/jack2-${JACK2_VERSION} ~/PawPawBuilds/builds/${target}/jack2-v1.9.21
+export JACK2_VERSION=v1.9.21
+
 ./PawPaw/pack-jack2.sh ${target}
 
 # ---------------------------------------------------------------------------------------------------------------------