diff --git a/Jenkinsfile b/Jenkinsfile
index 731faf6..c57ae60 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,16 +6,22 @@ def buildTarget(String path, String cmake_toolchain = '', boolean should_package
     final String build_directory = "cmake-build-${path}"
     final boolean not_packer_compatible = path.contains('riscv') || (path.contains('aarch64') && path.contains('mingw'))
     final boolean use_toolchain = cmake_toolchain != ''
-    // Note: CMake 3.20 or higher is needed
-    cmakeBuild buildDir: build_directory, buildType: 'release', cleanBuild: true, installation: 'Latest',
-        cmakeArgs: "--no-warn-unused-cli ${use_toolchain ? "-DCMAKE_TOOLCHAIN_FILE=${cmake_toolchain}" : "-DCMAKE_SYSTEM_NAME=\"${system_name}\" -DCMAKE_SYSTEM_PROCESSOR=\"${path.substring(0, path.indexOf('-'))}\" -DCMAKE_C_COMPILER=/usr/bin/${path}-gcc -DCMAKE_CXX_COMPILER=/usr/bin/${path}-g++ -DCMAKE_LINKER=${fileExists("${linker}.gold") ? "${linker}.gold" : linker} -DCMAKE_AR=/usr/bin/${path}-ar -DCMAKE_RC_COMPILER=/usr/bin/${path}-windres -DCMAKE_EXE_LINKER_FLAGS=-static"} -DNO_SELF_PACKER=${!(not_packer_compatible || use_toolchain) ? "OFF" : "ON"} -DIGNORE_MINIMAL_COMPILER_VERSION=ON -DNO_CCACHE=ON -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON",
-        generator: cmake_generator()
-    cmake arguments: "--build ./$build_directory --target ybcon", installation: 'Latest'
-    if (should_package) {
-        cpack installation: 'Latest', workingDir: build_directory
+    catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') {
+        // Note: CMake 3.20 or higher is needed
+        cmakeBuild buildDir: build_directory, buildType: 'release', cleanBuild: true, installation: 'Latest',
+            cmakeArgs: "--no-warn-unused-cli ${use_toolchain ? "-DCMAKE_TOOLCHAIN_FILE=${cmake_toolchain}" : "-DCMAKE_SYSTEM_NAME=\"${system_name}\" -DCMAKE_SYSTEM_PROCESSOR=\"${path.substring(0, path.indexOf('-'))}\" -DCMAKE_C_COMPILER=/usr/bin/${path}-gcc -DCMAKE_CXX_COMPILER=/usr/bin/${path}-g++ -DCMAKE_LINKER=${fileExists("${linker}.gold") ? "${linker}.gold" : linker} -DCMAKE_AR=/usr/bin/${path}-ar -DCMAKE_RC_COMPILER=/usr/bin/${path}-windres -DCMAKE_EXE_LINKER_FLAGS=-static"} -DNO_SELF_PACKER=${!(not_packer_compatible || use_toolchain) ? "OFF" : "ON"} -DIGNORE_MINIMAL_COMPILER_VERSION=ON -DNO_CCACHE=ON -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON",
+            generator: cmake_generator()
+        cmake arguments: "--build ./$build_directory --target ybcon", installation: 'Latest'
+        if (should_package) {
+            cpack installation: 'Latest', workingDir: build_directory
+        }
     }
 }
 
+def upload_archives() {
+    archiveArtifacts artifacts: 'cmake-build-*/*.deb, cmake-build-*/*.rpm, cmake-build-*/*.tar.gz, cmake-build-*/*.sh, cmake-build-*/*.js, cmake-build-*/*Windows.*.exe, cmake-build-*/*.zip', fingerprint: false
+}
+
 /* Required Plugins:
     - CMake
     - Sidebar Link
@@ -45,42 +51,49 @@ pipeline {
     }
     stages {
         stage('Build') {
+            matrix {
+                agent any
+                axes {
+                    axis {
+                        name 'TARGET'
+                        values(
+                            'x86_64-linux-musl',
+                            'i686-linux-musl',
+                            'armel-linux-musleabi',
+                            'armv7l-linux-musleabihf',
+                            'aarch64-linux-musl',
+                            'riscv64-linux-gnu',
+                            'x86_64-w64-mingw32',
+                            'i686-w64-mingw32',
+                            'armv7-w64-mingw32',
+                            'aarch64-w64-mingw32'
+                        )
+                    }
+                }
+                stages {
+                    stage('Compile and package') {
+                        steps {
+                            buildTarget("${TARGET}")
+                        }
+                    }
+                    stage('Deploy') {
+                        steps {
+                            echo 'Deploying....'
+                            upload_archives()
+                        }
+                    }
+                }
+            }
+        }
+        stage('Build using Emscripten') {
             steps {
-                echo "Building the ${env.BRANCH_NAME} branch.."
-                buildTarget('x86_64-linux-musl')
-                buildTarget('i686-linux-musl')
                 buildTarget('emscripten', '/usr/share/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake', false)
             }
         }
-        stage('Build for other architectures') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    buildTarget('armel-linux-musleabi')
-                    buildTarget('armv7l-linux-musleabihf')
-                    buildTarget('aarch64-linux-musl')
-                    buildTarget('riscv64-linux-gnu')
-                }
-            }
-        }
-        stage('Build for other platforms') {
-            steps {
-                catchError(buildResult: 'SUCCESS', stageResult: 'UNSTABLE') {
-                    buildTarget('armv7-w64-mingw32')
-                    buildTarget('aarch64-w64-mingw32')
-                }
-                catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    buildTarget('x86_64-w64-mingw32')
-                    buildTarget('i686-w64-mingw32')
-                }
-            }
-        }
         stage('Deploy') {
             steps {
                 echo 'Deploying....'
-                archiveArtifacts artifacts: 'cmake-build-*/*.deb, cmake-build-*/*.rpm, cmake-build-*/*.tar.gz, cmake-build-*/*.sh, cmake-build-*/*.js', fingerprint: false
-                catchError(buildResult: currentBuild.result, stageResult: 'SUCCESS') {
-                    archiveArtifacts artifacts: 'cmake-build-*/*Windows.*.exe, cmake-build-*/*.zip'
-                }
+                upload_archives()
             }
         }
     }