diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70dd5d95..f633ac9b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -233,11 +233,9 @@ jobs:
           operation: "install-deps"
       - win_make:
           operation: "build"
+      - run: bash -x ./scripts/patch_updater_yml.sh
       - run: mkdir -p ./build/win-release
-      - run: cp -r release/*.zip ./build/win-release
-      - run: cp -r release/*.msi ./build/win-release
-      - run: cp -r release/*.exe ./build/win-release
-
+      - run: bash -x ./scripts/cp_artifacts.sh release ./build/win-release
       - persist_to_workspace:
           root: ./build/
           paths:
diff --git a/scripts/Makefile.ps1 b/scripts/Makefile.ps1
index 9e9f56c2..d4dcb7d6 100644
--- a/scripts/Makefile.ps1
+++ b/scripts/Makefile.ps1
@@ -625,12 +625,12 @@ function Run-BuildMsi {
     Print-Info "Building 32 bits msi installer..."
     heat.exe dir "release\win-ia32-unpacked\" -o "scripts\msi_installer_files.wxs" -scom -frag -srd -sreg -gg -cg MattermostDesktopFiles -t "scripts\msi_installer_files_replace_id.xslt" -dr INSTALLDIR
     candle.exe -dPlatform=x86 "scripts\msi_installer.wxs" "scripts\msi_installer_files.wxs" -o "scripts\"
-    light.exe "scripts\msi_installer.wixobj" "scripts\msi_installer_files.wixobj" -loc "resources\windows\msi_i18n\en_US.wxl" -o "release\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x86.msi" -b "release\win-ia32-unpacked\"
+    light.exe "scripts\msi_installer.wixobj" "scripts\msi_installer_files.wixobj" -loc "resources\windows\msi_i18n\en_US.wxl" -o "release\$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x86.msi" -b "release\win-ia32-unpacked\"
 
     Print-Info "Building 64 bits msi installer..."
     heat.exe dir "release\win-unpacked\" -o "scripts\msi_installer_files.wxs" -scom -frag -srd -sreg -gg -cg MattermostDesktopFiles -t "scripts\msi_installer_files_replace_id.xslt" -t "scripts\msi_installer_files_set_win64.xslt" -dr INSTALLDIR
     candle.exe -dPlatform=x64 "scripts\msi_installer.wxs" "scripts\msi_installer_files.wxs" -o "scripts\"
-    light.exe "scripts\msi_installer.wixobj" "scripts\msi_installer_files.wixobj" -loc "resources\windows\msi_i18n\en_US.wxl" -o "release\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x64.msi" -b "release\win-unpacked\"
+    light.exe "scripts\msi_installer.wixobj" "scripts\msi_installer_files.wixobj" -loc "resources\windows\msi_i18n\en_US.wxl" -o "release\$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x64.msi" -b "release\win-unpacked\"
 
     # Only sign the executable and .dll if this is a release and not a pull request
     # check.
@@ -640,11 +640,11 @@ function Run-BuildMsi {
         # Dual signing is not supported on msi files. Is it recommended to sign with 256 hash.
         # src.: https://security.stackexchange.com/a/124685/84134
         # src.: https://social.msdn.microsoft.com/Forums/windowsdesktop/en-us/d4b70ecd-a883-4289-8047-cc9cde28b492#0b3e3b80-6b3b-463f-ac1e-1bf0dc831952
-        signtool.exe sign /f "./mattermost-desktop-windows.pfx" /p "$env:PFX_KEY" /tr "http://timestamp.digicert.com" /fd sha256 /td sha256 /d "release\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x86.msi" "release\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x86.msi"
+        signtool.exe sign /f "./mattermost-desktop-windows.pfx" /p "$env:PFX_KEY" /tr "http://timestamp.digicert.com" /fd sha256 /td sha256 /d "release\$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x86.msi" "release\$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x86.msi"
 
         Print-Info "Signing mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x64.msi (waiting for 15 seconds)..."
         Start-Sleep -s 15
-        signtool.exe sign /f "./mattermost-desktop-windows.pfx" /p "$env:PFX_KEY" /tr "http://timestamp.digicert.com" /fd sha256 /td sha256 /d "release\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x64.msi" "release\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x64.msi"
+        signtool.exe sign /f "./mattermost-desktop-windows.pfx" /p "$env:PFX_KEY" /tr "http://timestamp.digicert.com" /fd sha256 /td sha256 /d "release\$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x64.msi" "release\$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)\mattermost-desktop-$($env:COM_MATTERMOST_MAKEFILE_BUILD_ID)-x64.msi"
     } else {
         Print-Info "Certificate file not found, the msi installers won't be signed."
     }
diff --git a/scripts/cp_artifacts.sh b/scripts/cp_artifacts.sh
index 7245750c..597f0abf 100755
--- a/scripts/cp_artifacts.sh
+++ b/scripts/cp_artifacts.sh
@@ -18,21 +18,31 @@ fi
 if [[ -f "${SRC}/mattermost-desktop-${VERSION}-win-x64.zip" ]]; then
     echo -e "Copying Win64\n"
     cp "${SRC}/mattermost-desktop-${VERSION}-win-x64.zip" "${DEST}/mattermost-desktop-${VERSION}-win64.zip"
-    SOMETHING_COPIED=$((SOMETHING_COPIED + 2))
+    SOMETHING_COPIED=$((SOMETHING_COPIED + 1))
 fi
-
 if [[ ${MM_WIN_INSTALLERS-0} -eq 1 && -f "${SRC}/mattermost-desktop-setup-${VERSION}-win.exe" ]]; then
     echo -e "Copying win-no-arch\n"
     cp "${SRC}/mattermost-desktop-setup-${VERSION}-win.exe" "${DEST}/"
+    SOMETHING_COPIED=$((SOMETHING_COPIED + 2))
+fi
+if [[ ${MM_WIN_INSTALLERS-0} -eq 1 && -f "${SRC}/mattermost-desktop-${VERSION}-x64.msi" ]]; then
+    echo -e "Copying win-msi-x64\n"
+    cp "${SRC}/mattermost-desktop-${VERSION}-x64.msi" "${DEST}/"
+    SOMETHING_COPIED=$((SOMETHING_COPIED + 3))
+fi
+if [[ ${MM_WIN_INSTALLERS-0} -eq 1 && -f "${SRC}/mattermost-desktop-${VERSION}-x86.msi" ]]; then
+    echo -e "Copying win-msi-x86\n"
+    cp "${SRC}/mattermost-desktop-${VERSION}-x86.msi" "${DEST}/"
     SOMETHING_COPIED=$((SOMETHING_COPIED + 4))
 fi
+
 if [[ -f "${SRC}/mattermost-desktop-${VERSION}-mac.zip" ]]; then
     echo -e "Copying mac\n"
     cp "${SRC}"/mattermost-desktop-*-mac*.* "${DEST}/"
     if [[ -f "${SRC}"/mattermost-desktop-${VERSION}-mac.dmg ]]; then
         cp "${SRC}"/*.blockmap "${DEST}/"
     fi
-    SOMETHING_COPIED=$((SOMETHING_COPIED + 8))
+    SOMETHING_COPIED=$((SOMETHING_COPIED + 5))
 fi
 if [[ -f "${SRC}/mattermost-desktop-${VERSION}-mac-x64.zip" ]]; then
     echo -e "Copying mac-x64\n"
@@ -41,7 +51,7 @@ if [[ -f "${SRC}/mattermost-desktop-${VERSION}-mac-x64.zip" ]]; then
         cp "${SRC}/mattermost-desktop-${VERSION}-mac-x64.dmg.blockmap" "${DEST}/mattermost-desktop-${VERSION}-mac-x64.dmg.blockmap"
         cp "${SRC}/mattermost-desktop-${VERSION}-mac-x64.dmg" "${DEST}/mattermost-desktop-${VERSION}-mac-x64.dmg"
     fi
-    SOMETHING_COPIED=$((SOMETHING_COPIED + 8))
+    SOMETHING_COPIED=$((SOMETHING_COPIED + 6))
 fi
 if [[ -f "${SRC}/mattermost-desktop-${VERSION}-mac-arm64.zip" ]]; then
     echo -e "Copying mac-arm64\n"
@@ -50,7 +60,7 @@ if [[ -f "${SRC}/mattermost-desktop-${VERSION}-mac-arm64.zip" ]]; then
         cp "${SRC}/mattermost-desktop-${VERSION}-mac-arm64.dmg.blockmap" "${DEST}/mattermost-desktop-${VERSION}-mac-arm64.dmg.blockmap"
         cp "${SRC}/mattermost-desktop-${VERSION}-mac-arm64.dmg" "${DEST}/mattermost-desktop-${VERSION}-mac-arm64.dmg"
     fi
-    SOMETHING_COPIED=$((SOMETHING_COPIED + 16))
+    SOMETHING_COPIED=$((SOMETHING_COPIED + 7))
 fi
 if [[ -f "${SRC}/mattermost-desktop-${VERSION}-mac-universal.zip" ]]; then
     echo -e "Copying mac-universal\n"
@@ -59,13 +69,14 @@ if [[ -f "${SRC}/mattermost-desktop-${VERSION}-mac-universal.zip" ]]; then
         cp "${SRC}/mattermost-desktop-${VERSION}-mac-universal.dmg.blockmap" "${DEST}/mattermost-desktop-${VERSION}-mac-universal.dmg.blockmap"
         cp "${SRC}/mattermost-desktop-${VERSION}-mac-universal.dmg" "${DEST}/mattermost-desktop-${VERSION}-mac-universal.dmg"
     fi
-    SOMETHING_COPIED=$((SOMETHING_COPIED + 32))
+    SOMETHING_COPIED=$((SOMETHING_COPIED + 8))
 fi
+
 if [[ -f "${SRC}"/mattermost-desktop-${VERSION}-linux-x64.tar.gz ]]; then
     echo -e "Copying linux\n"
     cp "${SRC}"/mattermost-desktop-*-linux-* "${DEST}/"
     cp "${SRC}"/mattermost-desktop_"${VERSION}"-1_*.deb "${DEST}/"
-    SOMETHING_COPIED=$((SOMETHING_COPIED + 64))
+    SOMETHING_COPIED=$((SOMETHING_COPIED + 9))
 fi
 
 if [[ $SOMETHING_COPIED -eq 0 ]]; then