diff --git a/.github/workflows/publish-binaries-linux-x64.yaml b/.github/workflows/publish-binaries-linux-x64.yaml
deleted file mode 100644
index 321a0ec..0000000
--- a/.github/workflows/publish-binaries-linux-x64.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Publish Linux/x64 binaries
-
-on:
-  push:
-    tags:
-      - v1.*
-      - v1.*.*
-
-permissions:
-  contents: write
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-      - name: Build with Gradle
-        run: ./gradlew jpackageZip
-      - name: Rename jpackage zip
-        run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-linux-x64.zip
-      - name: Create Release
-        uses: ncipollo/release-action@v1.12.0
-        id: create_release
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          allowUpdates: true
-          replacesArtifacts: false
-          body: Fully automated release
-          artifacts: "./build/distributions/openrndr-application-linux-x64.zip"
diff --git a/.github/workflows/publish-binaries-windows.yaml b/.github/workflows/publish-binaries-windows.yaml
deleted file mode 100644
index 44e54d1..0000000
--- a/.github/workflows/publish-binaries-windows.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Publish Windows binaries
-
-on:
-  push:
-    tags:
-      - v1.*
-      - v1.*.*
-
-permissions:
-  contents: write
-
-jobs:
-  build:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-      - name: Build with Gradle
-        run: ./gradlew jpackageZip
-      - name: Rename jpackage zip
-        run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-windows.zip
-      - name: Create Release
-        uses: ncipollo/release-action@v1.12.0
-        id: create_release
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          allowUpdates: true
-          replacesArtifacts: false
-          body: Fully automated release
-          artifacts: "./build/distributions/openrndr-application-windows.zip"
diff --git a/.github/workflows/publish-binaries-macos.yaml b/.github/workflows/publish-binaries.yaml
similarity index 53%
rename from .github/workflows/publish-binaries-macos.yaml
rename to .github/workflows/publish-binaries.yaml
index 9467618..9ecb4c7 100644
--- a/.github/workflows/publish-binaries-macos.yaml
+++ b/.github/workflows/publish-binaries.yaml
@@ -9,19 +9,43 @@ on:
 permissions:
   contents: write
 
+# Required to make env var work on Windows
+defaults:
+  run:
+    shell: bash
+
 jobs:
   build:
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    runs-on: ${{ matrix.os }}          
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+
       - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
           java-version: 17
+
       - name: Build with Gradle
         run: ./gradlew jpackageZip
+
+
+      - run: echo "OR_TARGET_NAME=linux-x64" >> $GITHUB_ENV
+        if: matrix.os == 'ubuntu-latest'
+
+      - run: echo "OR_TARGET_NAME=macos" >> $GITHUB_ENV
+        if: matrix.os == 'macos-latest'
+
+      - run: echo "OR_TARGET_NAME=windows" >> $GITHUB_ENV
+        if: matrix.os == 'windows-latest'
+
       - name: Rename jpackage zip
-        run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-macos.zip
+        run: mv ./build/distributions/openrndr-application.zip ./build/distributions/openrndr-application-${{env.OR_TARGET_NAME}}.zip
+
       - name: Create Release
         uses: ncipollo/release-action@v1.12.0
         id: create_release
@@ -30,4 +54,5 @@ jobs:
           allowUpdates: true
           replacesArtifacts: false
           body: Fully automated release
-          artifacts: "./build/distributions/openrndr-application-macos.zip"
+          artifacts: "./build/distributions/openrndr-application-${{env.OR_TARGET_NAME}}.zip"
+