diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
deleted file mode 100644
index fb45e8f2..00000000
--- a/.github/workflows/artifacts.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-name: Build Haveno Installers
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build-linux:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Set up JDK
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '21'
-
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y rpm
-
-      - name: Build Haveno Installer for Linux
-        run: |
-          ./gradlew clean build --refresh-keys --refresh-dependencies
-          ./gradlew packageInstallers
-        working-directory: .
-
-      - name: Move Release Files
-        run: |
-          mkdir ${{ github.workspace }}/release
-          mv desktop/build/temp-*/binaries/haveno-*.rpm ${{ github.workspace }}/release
-          mv desktop/build/temp-*/binaries/haveno_*.deb ${{ github.workspace }}/release
-          mv desktop/build/temp-*/binaries/desktop-*.jar.SHA-256 ${{ github.workspace }}/release
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: HavenoInstaller-linux
-          path: ${{ github.workspace }}/release
-
-
-  build-macos:
-    runs-on: macos-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Set up JDK
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '21'
-
-      - name: Build Haveno Installer for macOS
-        run: |
-          ./gradlew clean build --refresh-keys --refresh-dependencies
-          ./gradlew packageInstallers
-        working-directory: .
-
-      - name: Move Release Files
-        run: |
-          mkdir ${{ github.workspace }}/release
-          mv desktop/build/temp-*/binaries/Haveno-*.dmg ${{ github.workspace }}/release
-          mv desktop/build/temp-*/binaries/desktop-*.jar.SHA-256 ${{ github.workspace }}/release
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: HavenoInstaller-macos
-          path: ${{ github.workspace }}/release
-
-  build-windows:
-    runs-on: windows-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Set up JDK
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '21'
-
-      - name: Install WiX Toolset
-        run: |
-          Invoke-WebRequest -Uri 'https://github.com/wixtoolset/wix3/releases/download/wix314rtm/wix314.exe' -OutFile wix314.exe
-          .\wix314.exe /quiet /norestart
-        shell: powershell
-
-      - name: Build Haveno Installer for Windows
-        run: |
-          ./gradlew clean build --refresh-keys --refresh-dependencies
-          ./gradlew packageInstallers
-        working-directory: .
-
-      - name: Move Release Files
-        run: |
-          mkdir ${{ github.workspace }}/release
-          Move-Item -Path desktop\build\temp-*/binaries\Haveno-*.exe -Destination ${{ github.workspace }}/release
-          Move-Item -Path desktop\build\temp-*/binaries\desktop-*.jar.SHA-256 -Destination ${{ github.workspace }}/release
-        shell: powershell
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: HavenoInstaller-windows
-          path: ${{ github.workspace }}/release
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 89e9e5d0..9e59cdb5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,3 +31,42 @@ jobs:
         with:
           name: cached-localnet
           path: .localnet
+      - name: Install dependencies
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          sudo apt update
+          sudo apt install -y rpm
+      - name: Install WiX Toolset
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          Invoke-WebRequest -Uri 'https://github.com/wixtoolset/wix3/releases/download/wix314rtm/wix314.exe' -OutFile wix314.exe
+          .\wix314.exe /quiet /norestart
+        shell: powershell
+      - name: Build Haveno Installer
+        run: |
+          ./gradlew clean build --refresh-keys --refresh-dependencies
+          ./gradlew packageInstallers
+        working-directory: .
+      - name: Move Release Files on Unix
+        if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' }}
+        run: |
+          mkdir ${{ github.workspace }}/release
+          if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
+            mv desktop/build/temp-*/binaries/haveno-*.rpm ${{ github.workspace }}/release
+            mv desktop/build/temp-*/binaries/haveno_*.deb ${{ github.workspace }}/release
+          else
+            mv desktop/build/temp-*/binaries/Haveno-*.dmg ${{ github.workspace }}/release
+          fi
+          mv desktop/build/temp-*/binaries/desktop-*.jar.SHA-256 ${{ github.workspace }}/release
+        shell: bash
+      - name: Move Release Files on Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          mkdir ${{ github.workspace }}/release
+          Move-Item -Path desktop\build\temp-*/binaries\Haveno-*.exe -Destination ${{ github.workspace }}/release
+          Move-Item -Path desktop\build\temp-*/binaries\desktop-*.jar.SHA-256 -Destination ${{ github.workspace }}/release
+        shell: powershell
+      - uses: actions/upload-artifact@v3
+        with:
+          name: HavenoInstaller-${{ matrix.os }}
+          path: ${{ github.workspace }}/release