diff --git a/build-android/build.sh b/build-android/build.sh
index fc7e741..88c9119 100755
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -22,6 +22,16 @@ java --version
 if [ "${CLASSICAL}" == "1" ]; then
   echo "Starting classical build for Android..."
 
+  $SCONS platform=android android_arch=arm64v8 $OPTIONS tools=yes target=release_debug
+  $SCONS platform=android android_arch=x86_64 $OPTIONS tools=yes target=release_debug
+
+  pushd platform/android/java
+  ./gradlew generateGodotEditor
+  popd
+
+  mkdir -p /root/out/tools
+  cp bin/android_editor.apk /root/out/tools/
+
   $SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release_debug
   $SCONS platform=android android_arch=armv7 $OPTIONS tools=no target=release
 
@@ -39,10 +49,10 @@ if [ "${CLASSICAL}" == "1" ]; then
   popd
 
   mkdir -p /root/out/templates
-  cp bin/android_source.zip /root/out/templates
-  cp bin/android_debug.apk /root/out/templates/android_debug.apk
-  cp bin/android_release.apk /root/out/templates/android_release.apk
-  cp bin/godot-lib.release.aar /root/out/templates/godot-lib.release.aar
+  cp bin/android_source.zip /root/out/templates/
+  cp bin/android_debug.apk /root/out/templates/
+  cp bin/android_release.apk /root/out/templates/
+  cp bin/godot-lib.release.aar /root/out/templates/
 fi
 
 # Mono
@@ -54,6 +64,16 @@ if [ "${MONO}" == "1" ]; then
   cp -r /root/mono-glue/GodotSharp/GodotSharp/Generated modules/mono/glue/GodotSharp/GodotSharp/
   cp -r /root/mono-glue/GodotSharp/GodotSharpEditor/Generated modules/mono/glue/GodotSharp/GodotSharpEditor/
 
+  #$SCONS platform=android android_arch=arm64v8 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-arm64-v8a-release tools=yes target=release_debug
+  #$SCONS platform=android android_arch=x86_64 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-x86_64-release tools=yes target=release_debug
+
+  #pushd platform/android/java
+  #./gradlew generateGodotEditor
+  #popd
+
+  #mkdir -p /root/out/tools-mono
+  #cp bin/android_editor.apk /root/out/tools-mono/
+
   $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armeabi-v7a-release tools=no target=release_debug
   $SCONS platform=android android_arch=armv7 $OPTIONS $OPTIONS_MONO mono_prefix=/root/mono-installs/android-armeabi-v7a-release tools=no target=release
 
@@ -71,10 +91,10 @@ if [ "${MONO}" == "1" ]; then
   popd
 
   mkdir -p /root/out/templates-mono
-  cp bin/android_source.zip /root/out/templates-mono
-  cp bin/android_debug.apk /root/out/templates-mono/android_debug.apk
-  cp bin/android_release.apk /root/out/templates-mono/android_release.apk
-  cp bin/godot-lib.release.aar /root/out/templates-mono/godot-lib.release.aar
+  cp bin/android_source.zip /root/out/templates-mono/
+  cp bin/android_debug.apk /root/out/templates-mono/
+  cp bin/android_release.apk /root/out/templates-mono/
+  cp bin/godot-lib.release.aar /root/out/templates-mono/
 
   mkdir -p /root/out/templates-mono/bcl
   cp -r /root/mono-installs/android-bcl/* /root/out/templates-mono/bcl/
diff --git a/build-release.sh b/build-release.sh
index 10b5ab6..f45fe58 100755
--- a/build-release.sh
+++ b/build-release.sh
@@ -284,6 +284,10 @@ if [ "${build_classical}" == "1" ]; then
   # Lib for direct download
   cp out/android/templates/godot-lib.release.aar ${reldir}/godot-lib.${templates_version}.release.aar
 
+  # Editor
+  binname="${godot_basename}_android_editor.apk"
+  cp out/android/tools/android_editor.apk ${reldir}/${binname}
+
   # Templates
   cp out/android/templates/*.apk ${templatesdir}/
   cp out/android/templates/android_source.zip ${templatesdir}/
@@ -489,6 +493,10 @@ if [ "${build_mono}" == "1" ]; then
   # Lib for direct download
   cp out/android/templates-mono/godot-lib.release.aar ${reldir_mono}/godot-lib.${templates_version}.mono.release.aar
 
+  # Editor
+  #binname="${godot_basename}_mono_android_editor.apk"
+  #cp out/android/tools-mono/android_editor.apk ${reldir_mono}/${binname}
+
   # Templates
   cp out/android/templates-mono/*.apk ${templatesdir_mono}/
   cp out/android/templates-mono/android_source.zip ${templatesdir_mono}/