diff --git a/Jenkinsfile b/Jenkinsfile
index d3470acafdaf6a45abb126c93c9ddc9af71e2077..3fdb6050c0dfeed30d2de9055188187d3a5d0f0a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -92,13 +92,33 @@ pipeline
                 }
             }
         }
-        stage('Zap application distribution build')
+        stage('Zap application distribution build: Linux')
         {
             steps
             {
                 script 
                 {
-                    sh 'npm run dist-all || true'
+                    sh 'npm run dist-linux'
+                }
+            }
+        }
+        stage('Zap application distribution build: Mac')
+        {
+            steps
+            {
+                script 
+                {
+                    sh 'npm run dist-mac || true'
+                }
+            }
+        }
+        stage('Zap application distribution build: Windows')
+        {
+            steps
+            {
+                script 
+                {
+                    sh 'npm run dist-win || true'
                 }
             }
         }
diff --git a/package.json b/package.json
index cec4a25e243783969728e309120d083f270b6cf4..d99e8bd3e3c8302ea66a6f5aff12c550d8173157 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,9 @@
     "pack": "quasar build && electron-builder --dir",
     "dist": "electron-builder",
     "dist-all": "electron-builder -mwl",
+    "dist-linux": "electron-builder -l",
+    "dist-win": "electron-builder -w",
+    "dist-mac": "electron-builder -m",
     "linuxpack-ui": "./dist/linux-unpacked/zap --zclProperties zcl-builtin/zcl-test.properties --genTemplateJson test/gen-template/gen-templates.json",
     "linuxpack-check": "./dist/linux-unpacked/zap selfCheck --zclProperties zcl-builtin/zcl-test.properties --genTemplateJson test/gen-template/gen-templates.json",
     "linuxpack-gen": "./dist/linux-unpacked/zap generate --noUi --noServer --zclProperties zcl-builtin/zcl-test.properties --genTemplateJson test/gen-template/gen-templates.json --output tmp",