diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 3cf1e0f..ff26ec2 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -59,9 +59,10 @@ jobs:
         run: gdlint scripts db scenes
 
   # ---------------------------------------------------------------------------
-  # 3. Desktop exports (Windows / Linux / macOS) — runs in parallel.
-  #    macOS preset must be added in the Godot editor before this matrix entry
-  #    can succeed (export_presets.cfg currently has none).
+  # 3. Desktop exports — runs in parallel.
+  #    macOS is commented out until a preset is added in the Godot editor
+  #    (export_presets.cfg has none today). Restore the entry once the preset
+  #    exists; the matrix is otherwise ready to take it.
   # ---------------------------------------------------------------------------
   export-desktop:
     name: Export ${{ matrix.platform }}
@@ -79,10 +80,10 @@ jobs:
             preset: Linux/X11Debug
             output: releases/linux/Puzzle-Quest.x86_64
             artifact_path: releases/linux
-          - platform: macOS
-            preset: macOS
-            output: releases/macos/Puzzle-Quest.zip
-            artifact_path: releases/macos
+          # - platform: macOS
+          #   preset: macOS
+          #   output: releases/macos/Puzzle-Quest.zip
+          #   artifact_path: releases/macos
     steps:
       - uses: actions/checkout@v4
 
@@ -157,7 +158,11 @@ jobs:
               -keystore /tmp/debug.keystore -storepass android \
               -dname "CN=Android Debug,O=Android,C=US" -validity 9999
           fi
+          # Godot rejects exports unless all three keystore/debug{,_user,_password}
+          # are set together (or all three empty) — patch every one.
           sed -i 's@keystore/debug=".*"@keystore/debug="/tmp/debug.keystore"@g' export_presets.cfg
+          sed -i 's@keystore/debug_user=".*"@keystore/debug_user="androiddebugkey"@g' export_presets.cfg
+          sed -i 's@keystore/debug_password=".*"@keystore/debug_password="android"@g' export_presets.cfg
 
       - name: Write Godot editor settings (Android SDK / JDK paths)
         run: |
diff --git a/export_presets.cfg b/export_presets.cfg
index 0cbd70e..d13ec20 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -230,7 +230,7 @@ codesign/timestamp_server_url=""
 codesign/digest_algorithm=1
 codesign/description=""
 codesign/custom_options=PoolStringArray(  )
-application/icon="res://releases/windows/project.ico"
+application/icon=""
 application/file_version=""
 application/product_version=""
 application/company_name=""
@@ -296,7 +296,7 @@ codesign/timestamp_server_url=""
 codesign/digest_algorithm=1
 codesign/description=""
 codesign/custom_options=PoolStringArray(  )
-application/icon="res://releases/windows/project.ico"
+application/icon=""
 application/file_version=""
 application/product_version=""
 application/company_name=""