diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index f185075..b439f9e 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -30,59 +30,38 @@ jobs:
           Write-Host "Project file exists: $(Test-Path 'project.godot')"
           Get-ChildItem -Path . -Filter "*.cfg" | Select-Object Name
 
-      - name: Cache Export Templates
-        uses: actions/cache@v4
-        id: cache-templates
-        with:
-          path: C:\WINDOWS\ServiceProfiles\NetworkService\AppData\Roaming\Godot\export_templates\4.4.1.stable
-          key: godot-templates-4.4.1-stable-v1
-
-      - name: Setup Export Templates and Tools
-        if: steps.cache-templates.outputs.cache-hit != 'true'
-        run: |
-          # Setup export templates
-          $templateDir = "C:\WINDOWS\ServiceProfiles\NetworkService\AppData\Roaming\Godot\export_templates\4.4.1.stable"
-          Write-Host "Creating export template directory..."
-          New-Item -ItemType Directory -Force -Path $templateDir
-          
-          Write-Host "Downloading export templates..."
-          Invoke-WebRequest -Uri "https://github.com/godotengine/godot/releases/download/4.4.1-stable/Godot_v4.4.1-stable_export_templates.tpz" -OutFile "templates.tpz"
-          
-          Write-Host "Renaming .tpz to .zip for extraction..."
-          Rename-Item "templates.tpz" "templates.zip"
-          
-          Write-Host "Extracting templates..."
-          Expand-Archive -Path "templates.zip" -DestinationPath "temp_templates" -Force
-          
-          Write-Host "Copying templates to correct location..."
-          Copy-Item -Path "temp_templates\templates\*" -Destination $templateDir -Recurse -Force
-          
-          Write-Host "Cleaning up..."
-          Remove-Item -Path "temp_templates" -Recurse -Force
-          Remove-Item -Path "templates.zip" -Force
-          
-          Write-Host "Export templates installed to: $templateDir"
-
-      - name: Verify Templates
+      - name: Verify Export Templates
         run: |
           $templateDir = "C:\WINDOWS\ServiceProfiles\NetworkService\AppData\Roaming\Godot\export_templates\4.4.1.stable"
           Write-Host "Checking for export templates at: $templateDir"
+          
           if (Test-Path $templateDir) {
             Write-Host "Export templates found. Contents:"
-            Get-ChildItem -Path $templateDir | Select-Object Name, Length | Format-Table
+            Get-ChildItem -Path $templateDir | Where-Object {$_.Name -like "*windows*"} | Select-Object Name, Length | Format-Table
+            
+            # Verify the specific Windows templates we need
+            $debugTemplate = Join-Path $templateDir "windows_debug_x86_64.exe"
+            $releaseTemplate = Join-Path $templateDir "windows_release_x86_64.exe"
+            
+            if ((Test-Path $debugTemplate) -and (Test-Path $releaseTemplate)) {
+              Write-Host "✅ Required Windows templates found"
+            } else {
+              Write-Host "❌ Required Windows templates missing"
+              exit 1
+            }
           } else {
-            Write-Host "ERROR: Export templates not found!"
+            Write-Host "❌ Export template directory not found!"
             exit 1
           }
           
           # Check if rcedit is available (it's already in the project)
           Write-Host "Checking for rcedit..."
           if (Test-Path "rcedit-x64.exe") {
-            Write-Host "rcedit found in project directory"
+            Write-Host "✅ rcedit found in project directory"
           } else {
             Write-Host "rcedit not found - downloading..."
             Invoke-WebRequest -Uri "https://github.com/electron/rcedit/releases/latest/download/rcedit-x64.exe" -OutFile "rcedit-x64.exe"
-            Write-Host "rcedit downloaded"
+            Write-Host "✅ rcedit downloaded"
           }
 
       - name: Windows Build