diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
index a3e09f74..4ffa34ed 100644
--- a/.github/workflows/build_and_test.yaml
+++ b/.github/workflows/build_and_test.yaml
@@ -86,24 +86,29 @@ jobs:
                     - name: Windows (x86) Squirrel
                       os: windows-2022
                       artifact: win-ia32
-                      executable: "$LOCALAPPDATA/element-desktop*/Element.exe"
-                      prepare_cmd: '. "./dist/squirrel-windows*/Element Setup*.exe"; Start-Sleep -Seconds 15'
+                      executable: "$LOCALAPPDATA/element-desktop/Element.exe"
+                      prepare_cmd: '. "./dist/squirrel-windows*/Element Setup*.exe"; Start-Sleep -Seconds 30'
                     - name: Windows (x86) MSI
                       os: windows-2022
                       artifact: win-ia32
-                      executable: "C:/Program File*/Elemen*/Element.exe"
-                      #                      executable: "C:/Program Files (x86)/Element*/Element*.exe"
-                      prepare_cmd: 'Start-Process msiexec "/i ./dist/Element*.msi /qn"'
+                      executable: "C:/Program Files (x86)/Element/Element.exe"
+                      prepare_cmd: |
+                          $file = Get-Item ./dist/*.msi | Select -First 1 -ExpandProperty FullName
+                          $procMain = Start-Process "msiexec" "/i `"$file`" /qn /l*! `"$log`"" -NoNewWindow -PassThru
+                          $procMain.WaitForExit()
                     - name: Windows (x64) Squirrel
                       os: windows-2022
                       artifact: win-x64
-                      executable: "$LOCALAPPDATA/element-desktop*/Element.exe"
-                      prepare_cmd: '. "./dist/squirrel-windows*/Element Setup*.exe"; Wait-Process -Name Setup'
+                      executable: "$LOCALAPPDATA/element-desktop/Element.exe"
+                      prepare_cmd: '. "./dist/squirrel-windows*/Element Setup*.exe"; Wait-Process -Name setup'
                     - name: Windows (x64) MSI
                       os: windows-2022
                       artifact: win-x64
-                      executable: "C:/Program File*/Elemen*/Element.exe"
-                      prepare_cmd: 'Start-Process msiexec "/i ./dist/Element*.msi /qn"'
+                      executable: "C:/Program Files/Element/Element.exe"
+                      prepare_cmd: |
+                          $file = Get-Item ./dist/*.msi | Select -First 1 -ExpandProperty FullName
+                          $procMain = Start-Process "msiexec" "/i `"$file`" /qn /l*! `"$log`"" -NoNewWindow -PassThru
+                          $procMain.WaitForExit()
         name: Test ${{ matrix.name }}
         runs-on: ${{ matrix.os }}
         steps: