diff --git a/Jenkinsfile b/Jenkinsfile
index a57c895..718eaa4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -8,6 +8,8 @@ def buildTarget(String path, String rpmArch = 'noarch', String debArch = 'noarch
     cpack installation: 'Latest', workingDir: "cmake-build-${packageArch}${suffix}"
 }
 
+String windowsSuffix = '-windows'
+
 pipeline { // Multi-branch pipeline script for Yerbacon.
     agent any
 
@@ -36,10 +38,10 @@ pipeline { // Multi-branch pipeline script for Yerbacon.
         stage('Build for other platforms') {
             steps {
                 catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                    buildTarget('x86_64-w64-mingw32', 'x86_64', 'amd64', true, 'windows')
-                    buildTarget('i686-w64-mingw32', 'i386', 'i386', true, 'windows')
-                    buildTarget('armv7-w64-mingw32', 'armv7hl', 'armhf', true, 'windows')
-                    buildTarget('aarch64-w64-mingw32', 'aarch64', 'arm64', false, 'windows')
+                    buildTarget('x86_64-w64-mingw32', 'x86_64', 'amd64', true, windowsSuffix)
+                    buildTarget('i686-w64-mingw32', 'i386', 'i386', true, windowsSuffix)
+                    buildTarget('armv7-w64-mingw32', 'armv7hl', 'armhf', true, windowsSuffix)
+                    buildTarget('aarch64-w64-mingw32', 'aarch64', 'arm64', false, windowsSuffix)
                 }
             }
         }
@@ -47,6 +49,9 @@ pipeline { // Multi-branch pipeline script for Yerbacon.
             steps {
                 echo 'Deploying....'
                 archiveArtifacts artifacts: 'cmake-build-*/*.deb, cmake-build-*/*.rpm, cmake-build-*/*.tar.gz, cmake-build-*/*.sh', fingerprint: false
+                catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
+                    archiveArtifacts artifacts: 'cmake-build-*/*wpkg.*.exe, cmake-build-*/*.zip'
+                }
             }
         }
     }