diff --git a/template/Setup-WinBuild2025.ps1 b/template/Setup-WinBuild2025.ps1
index 72a370b..e9915ce 100644
--- a/template/Setup-WinBuild2025.ps1
+++ b/template/Setup-WinBuild2025.ps1
@@ -1027,13 +1027,13 @@ if (Test-Path $gitExe) {
         throw "Git installation failed (exit $($gitProc.ExitCode))."
     }
 
-    # Git installer adds to PATH automatically; refresh
-    $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' +
-                [System.Environment]::GetEnvironmentVariable('PATH', 'User')
-
     Write-Host "Git installed: $(git --version 2>&1)"
 }
 
+# Refresh PATH whether freshly installed or already present
+$env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' +
+            [System.Environment]::GetEnvironmentVariable('PATH', 'User')
+
 # Validation
 Assert-Step 'Git' 'git command resolvable' {
     [bool](Get-Command git -ErrorAction SilentlyContinue)
@@ -1076,13 +1076,13 @@ if (Test-Path $sevenZipExe) {
         throw "7-Zip installation failed (exit $($msiProc.ExitCode))."
     }
 
-    # 7-Zip MSI adds to PATH; refresh session environment variable
-    $env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' +
-                [System.Environment]::GetEnvironmentVariable('PATH', 'User')
-
     Write-Host "7-Zip installed."
 }
 
+# Refresh PATH whether freshly installed or already present
+$env:PATH = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' +
+            [System.Environment]::GetEnvironmentVariable('PATH', 'User')
+
 # Validation
 Assert-Step '7-Zip' '7z.exe exists at expected path' {
     Test-Path -Path $sevenZipExe -PathType Leaf