diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index ce9ac0d0d2..feade53040 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -117,7 +117,7 @@ jobs:
         make test TEST_VERBOSE=1
 
   build_windows:
-    name: 'Windows Q${{matrix.quantum}}-${{matrix.platform}} hdri=${{matrix.hdri}} (${{matrix.buildType}})'
+    name: Windows ${{matrix.quantum}}${{matrix.hdri_flag}}-${{matrix.architecture}} (${{matrix.buildType}})
     needs:
       - change_log
     runs-on: windows-2022
@@ -125,17 +125,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        quantum: [ 8, 16, 32, 64 ]
-        hdri: [ yes, no ]
-        buildType: [ dmt, smtd ]
-        platform: [ x64, x86, arm64 ]
+        architecture: [ x64, arm64, x86 ]
+        buildType: [ dynamic, static ]
+        quantum: [ Q8, Q16, Q32 ]
+        hdri: [ hdri, noHdri ]
         exclude:
-          - quantum: 8
-            hdri: yes
-          - quantum: 32
-            hdri: no
-          - quantum: 64
-            hdri: no
+          - quantum: Q8
+            hdri: hdri
+          - quantum: Q32
+            hdri: noHdri
+        include:
+          - hdri: hdri
+            hdri_flag: -HDRI
 
     steps:
     - name: Clone ImageMagick
@@ -143,37 +144,33 @@ jobs:
       with:
         path: ImageMagick
 
-    - name: Clone ImageMagick-Windows
-      uses: actions/checkout@v4
-      with:
-        repository: ImageMagick/ImageMagick-Windows
-        path: ImageMagick-Windows
-        ref: refs/heads/main
-
-    - name: Clone repositories
+    - name: Download configure
       shell: cmd
       run: |
-        cd ImageMagick-Windows
-        CloneRepositories.IM7.cmd
+        ImageMagick\.github\build\windows\download-configure.cmd
+
+    - name: Download dependencies
+      shell: cmd
+      run: |
+        ImageMagick\.github\build\windows\download-dependencies.cmd windows-${{matrix.architecture}}-${{matrix.buildType}}-openMP.zip
 
     - name: Download ChangeLog.md
       uses: actions/download-artifact@v4
       with:
         name: ChangeLog
-        path: ImageMagick-Windows\ImageMagick
+        path: ImageMagick
 
     - name: Configure ImageMagick
       shell: cmd
+      working-directory: Configure
       run: |
-        cd ImageMagick-Windows\Configure
-        Configure.Release.x64.exe /noWizard /VS2022 /includeOptional /incompatibleLicense /deprecated /${{matrix.platform}} /${{matrix.buildType}}
+        Configure.Release.x64.exe /noWizard /VS2022 /deprecated /${{matrix.architecture}} /${{matrix.buildType}} /${{matrix.quantum}} /${{matrix.hdri}}
 
     - name: Build ImageMagick
       shell: cmd
       run: |
         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
-        cd ImageMagick-Windows
-        msbuild /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.platform}}
+        msbuild /m /t:Rebuild /p:Configuration=Release,Platform=${{matrix.architecture}}
 
   build_windows_zero_configuration:
     name: 'Windows Q16-x64 hdri=yes (zero configuration ${{matrix.buildType}})'
@@ -182,7 +179,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        buildType: [ dmt, smtd ]
+        buildType: [ dynamic, static ]
 
     steps:
     - name: Clone ImageMagick
@@ -190,30 +187,21 @@ jobs:
       with:
         path: ImageMagick
 
-    - name: Clone ImageMagick-Windows
-      uses: actions/checkout@v4
-      with:
-        repository: ImageMagick/ImageMagick-Windows
-        path: ImageMagick-Windows
-        ref: refs/heads/main
-
-    - name: Clone repositories
+    - name: Download dependencies
       shell: cmd
       run: |
-        cd ImageMagick-Windows
-        CloneRepositories.IM7.cmd
+        ImageMagick\.github\build\windows\download-dependencies.cmd windows-x64-${{matrix.buildType}}-openMP.zip
 
     - name: Configure ImageMagick
       shell: cmd
+      working-directory: Configure
       run: |
-        cd ImageMagick-Windows\Configure
         Configure.Release.x64.exe /noWizard /VS2022 /x64 /${{matrix.buildType}} /zeroConfigurationSupport
 
     - name: Build ImageMagick
       shell: cmd
       run: |
         call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
-        cd ImageMagick-Windows
         msbuild /m /t:Rebuild /p:Configuration=Release,Platform=x64
 
   build_msys2: