diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 60d32d7..2f0a948 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version to build (e.g., 2.3.8)'
+        description: 'Version to build (e.g., 2.4.0)'
         required: true
         type: string
 
@@ -29,9 +29,13 @@ jobs:
 
       - name: Setup Export Templates
         run: |
-          mkdir -p ~/.local/share/godot/export_templates/4.6.stable
-          wget https://github.com/godotengine/godot/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz
-          unzip Godot_v4.6-stable_export_templates.tpz -d ~/.local/share/godot/export_templates/4.6.stable
+          TEMPLATES_DIR=~/.local/share/godot/export_templates/4.6.stable
+          mkdir -p "$TEMPLATES_DIR"
+          wget -q https://github.com/godotengine/godot/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz -O templates.tpz
+          unzip -q templates.tpz -d "$TEMPLATES_DIR"
+          # tpz extracts into templates/ subfolder — flatten it
+          mv "$TEMPLATES_DIR/templates/"* "$TEMPLATES_DIR/"
+          rmdir "$TEMPLATES_DIR/templates"
 
       - name: Export Windows Build
         run: |
@@ -62,9 +66,12 @@ jobs:
 
       - name: Setup Export Templates
         run: |
-          mkdir -p ~/.local/share/godot/export_templates/4.6.stable
-          wget https://github.com/godotengine/godot/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz
-          unzip Godot_v4.6-stable_export_templates.tpz -d ~/.local/share/godot/export_templates/4.6.stable
+          TEMPLATES_DIR=~/.local/share/godot/export_templates/4.6.stable
+          mkdir -p "$TEMPLATES_DIR"
+          wget -q https://github.com/godotengine/godot/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz -O templates.tpz
+          unzip -q templates.tpz -d "$TEMPLATES_DIR"
+          mv "$TEMPLATES_DIR/templates/"* "$TEMPLATES_DIR/"
+          rmdir "$TEMPLATES_DIR/templates"
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
@@ -98,9 +105,12 @@ jobs:
 
       - name: Setup Export Templates
         run: |
-          mkdir -p ~/Library/Application\ Support/Godot/export_templates/4.6.stable
-          wget https://github.com/godotengine/godot/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz
-          unzip Godot_v4.6-stable_export_templates.tpz -d ~/Library/Application\ Support/Godot/export_templates/4.6.stable
+          TEMPLATES_DIR=~/Library/Application\ Support/Godot/export_templates/4.6.stable
+          mkdir -p "$TEMPLATES_DIR"
+          wget -q https://github.com/godotengine/godot/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz -O templates.tpz
+          unzip -q templates.tpz -d "$TEMPLATES_DIR"
+          mv "$TEMPLATES_DIR/templates/"* "$TEMPLATES_DIR/"
+          rmdir "$TEMPLATES_DIR/templates"
 
       - name: Export macOS Build
         run: |
diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index a27ebfa..c4b1b64 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version to build (e.g., 2.3.8)'
+        description: 'Version to build (e.g., 2.4.0)'
         required: true
         type: string
 
@@ -42,6 +42,15 @@ jobs:
           version: '4.6.0'
           use-dotnet: false
 
+      - name: Setup Export Templates
+        run: |
+          TEMPLATES_DIR=~/.local/share/godot/export_templates/4.6.stable
+          mkdir -p "$TEMPLATES_DIR"
+          wget -q https://github.com/godotengine/godot/releases/download/4.6-stable/Godot_v4.6-stable_export_templates.tpz -O templates.tpz
+          unzip -q templates.tpz -d "$TEMPLATES_DIR"
+          mv "$TEMPLATES_DIR/templates/"* "$TEMPLATES_DIR/"
+          rmdir "$TEMPLATES_DIR/templates"
+
       - name: Setup Android SDK (Android only)
         if: matrix.platform.name == 'Android'
         uses: android-actions/setup-android@v3