diff --git a/.github/scripts/Windows/install_jack.ps1 b/.github/scripts/Windows/install_jack.ps1
index 07c828614..98ce3a435 100644
--- a/.github/scripts/Windows/install_jack.ps1
+++ b/.github/scripts/Windows/install_jack.ps1
@@ -6,6 +6,6 @@ choco install -y --no-progress jack
 # 1. it will be cached here
 # 2. if it were in a Windows directory, it won't be bundled with UltraGrid
 #    (also make sure to remove from the Windows directory)
-New-Item -Type Directory 'C:\Program Files (x86)\Jack\bin'
-Move-Item 'C:\Windows\libjack64.dll' 'C:\Program Files (x86)\Jack\bin'
+New-Item -Type Directory 'C:\Program Files\JACK2\bin'
+Move-Item 'C:\Windows\libjack64.dll' 'C:\Program Files\JACK2\bin'
 
diff --git a/.github/scripts/Windows/prepare_msys.sh b/.github/scripts/Windows/prepare_msys.sh
index 5c6f60d30..ba4527cd1 100644
--- a/.github/scripts/Windows/prepare_msys.sh
+++ b/.github/scripts/Windows/prepare_msys.sh
@@ -21,10 +21,10 @@ if test -d /c/Program\ Files/NewTek; then
         cat $NDI_D/Version.txt | sed 's/\(.*\)/\#define NDI_VERSION \"\1\"/' | tee /usr/local/include/ndi_version.h
 fi
 
-JACK_D=/c/Program\ Files\ \(x86\)/Jack
+JACK_D=/c/Program\ Files/JACK2
 if test -d "$JACK_D"; then
         export PATH=$PATH:$JACK_D/bin
-        export CPATH=$CPATH:$JACK_D/includes
+        export CPATH=$CPATH:$JACK_D/include
         export LIBRARY_PATH=$LIBRARY_PATH:$JACK_D/lib
 fi
 
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 72f630d16..052412d45 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -236,8 +236,8 @@ jobs:
       id: cache-jack
       uses: actions/cache@v1
       with:
-        path: 'C:\Program Files (x86)\Jack'
-        key: cache-jack-2
+        path: 'C:\Program Files\JACK2'
+        key: cache-jack-3
     - name: Install JACK
       if: steps.cache-jack.outputs.cache-hit != 'true'
       run: .github/scripts/Windows/install_jack.ps1