diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c88b198..66bbf9f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -97,7 +97,8 @@ jobs:
         name: Build Godot template for Android
         run: |
           cd godot
-          scons p=android arch=arm64 generate_apk=yes ${BUILD_OPTIONS} target=template_debug
+          scons p=android arch=arm32 ${BUILD_OPTIONS} target=template_debug
+          scons p=android arch=arm64 ${BUILD_OPTIONS} target=template_debug generate_apk=yes
           mkdir -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/
           mv ./bin/android_debug.apk ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_debug.apk
           mv ./bin/android_source.zip ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/android_source.zip
@@ -106,6 +107,8 @@ jobs:
         name: Build Godot release template for Android
         run: |
           cd godot
+          scons p=android arch=x86_32 ${BUILD_OPTIONS} target=template_release
+          scons p=android arch=x86_64 ${BUILD_OPTIONS} target=template_release
           scons p=android arch=arm32 ${BUILD_OPTIONS} target=template_release
           scons p=android arch=arm64 ${BUILD_OPTIONS} target=template_release generate_apk=yes
           mkdir -p ~/.local/share/godot/export_templates/${GODOT_VERSION}.${GODOT_RELEASE}/
diff --git a/export_presets.cfg b/export_presets.cfg
index 4b06249..d4fdc76 100644
--- a/export_presets.cfg
+++ b/export_presets.cfg
@@ -29,8 +29,8 @@ gradle_build/export_format=0
 gradle_build/min_sdk=""
 gradle_build/target_sdk=""
 gradle_build/custom_theme_attributes={
-"android:windowSplashScreenBackground": "#1a1a1a",
-"windowSplashScreenAnimatedIcon": "@drawable/splash_anim"
+"[splash]android:windowSplashScreenBackground": "#1a1a1a",
+"[splash]windowSplashScreenAnimatedIcon": "@drawable/splash_anim"
 }
 architectures/armeabi-v7a=true
 architectures/arm64-v8a=true
@@ -254,8 +254,8 @@ gradle_build/export_format=1
 gradle_build/min_sdk=""
 gradle_build/target_sdk=""
 gradle_build/custom_theme_attributes={
-"android:windowSplashScreenBackground": "#1a1a1a",
-"windowSplashScreenAnimatedIcon": "@drawable/splash_anim"
+"[splash]android:windowSplashScreenBackground": "#1a1a1a",
+"[splash]windowSplashScreenAnimatedIcon": "@drawable/splash_anim"
 }
 architectures/armeabi-v7a=true
 architectures/arm64-v8a=true