diff --git a/template/Setup-WinBuild2025.ps1 b/template/Setup-WinBuild2025.ps1
index 4368b33..541c426 100644
--- a/template/Setup-WinBuild2025.ps1
+++ b/template/Setup-WinBuild2025.ps1
@@ -144,7 +144,7 @@ param(
     [string] $AdminPassword = '',
 
     # Git for Windows version (latest stable)
-    [string] $GitVersion = '2.54.0',
+    [string] $GitVersion = '2.54.0.windows.1',
 
     # 7-Zip version (latest stable)
     [string] $SevenZipVersion = '24.07'
@@ -997,7 +997,9 @@ $gitExe = Join-Path $gitDir 'bin\git.exe'
 if (Test-Path $gitExe) {
     Write-Host "Git for Windows already installed: $(& $gitExe --version 2>&1)"
 } else {
-    $gitUrl     = "https://github.com/git-for-windows/git/releases/download/v$GitVersion/Git-$GitVersion-64-bit.exe"
+    # Extract base version (e.g. '2.54.0' from '2.54.0.windows.1') for filename
+    $gitVersionBase = $GitVersion -replace '\.windows\.\d+$', ''
+    $gitUrl     = "https://github.com/git-for-windows/git/releases/download/v$GitVersion/Git-$gitVersionBase-64-bit.exe"
     $gitInstaller = 'C:\CI\git_installer.exe'
 
     Write-Host "Downloading Git for Windows $GitVersion..."
@@ -1007,7 +1009,7 @@ if (Test-Path $gitExe) {
         throw "Failed to download Git from $gitUrl : $_"
     }
 
-    Assert-Hash -FilePath $gitInstaller -Label "Git-$GitVersion-64-bit.exe" `
+    Assert-Hash -FilePath $gitInstaller -Label "Git-$gitVersionBase-64-bit.exe" `
                 -Expected $script:Hashes['GitForWindows']
 
     Write-Host "Installing Git for Windows (silent, with PATH)..."