diff --git a/circle.yml b/circle.yml
index 132a121d..ce9b0e7a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -29,6 +29,7 @@ dependencies:
     - tar zcvf $CIRCLE_ARTIFACTS/mattermost-desktop-linux-ia32.tar.gz -C release mattermost-desktop-linux-ia32
     - tar zcvf $CIRCLE_ARTIFACTS/mattermost-desktop-linux-x64.tar.gz -C release mattermost-desktop-linux-x64
     - cp release/*.deb $CIRCLE_ARTIFACTS/
+    - cp release/windows-installer/mattermost-setup.exe $CIRCLE_ARTIFACTS/
 
 test:
   post:
diff --git a/docker/package_in_docker.sh b/docker/package_in_docker.sh
index 3d4216df..600e39c6 100755
--- a/docker/package_in_docker.sh
+++ b/docker/package_in_docker.sh
@@ -4,3 +4,4 @@ set -ex
 cd electron-mattermost
 npm run package:all
 npm run package:linux
+npm run installer
diff --git a/script/installer.js b/script/installer.js
index f96ab5d1..9cd45c4e 100644
--- a/script/installer.js
+++ b/script/installer.js
@@ -22,7 +22,7 @@ function getInstallerConfig() {
     //loadingGif: path.join(rootPath, 'assets', 'img', 'loading.gif'),
     noMsi: true,
     outputDirectory: path.join(outPath, 'windows-installer'),
-    setupExe: 'Mattermost.exe',
+    setupExe: 'mattermost-setup.exe',
     setupIcon: path.join(rootPath, 'resources', 'icon.ico'),
     skipUpdateIcon: true,
     exe: 'Mattermost.exe'