diff --git a/buildScript b/buildScript
index 1e5364f50abb..0280e1d1734d 100644
--- a/buildScript
+++ b/buildScript
@@ -1,5 +1,7 @@
 set -e
 
+working_dir=$(pwd)
+
 scons platform=windows module_mono_enabled=yes arch=x86_64 precision=double dev_build=yes use_mingw=yes separate_debug_symbols=yes -j8
 bin/godot.windows.editor.dev.double.x86_64.mono.exe --generate-mono-glue modules/mono/glue --precision=double
 python ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir ./bin --push-nupkgs-local "../GodotNugetSourceData" --precision=double
@@ -10,8 +12,28 @@ cp -r ../GodotNugetSourceData   ${APPDATA}/NuGet/GodotNugetSource
 cp -r ../GodotNugetSourceData   ${APPDATA}/NuGet/LocalNugetSource
 
 if [[ -n "${TEMPLATES}" ]] ; then
+    echo ""
+    echo "Building templates!!"
+    echo ""
+    sleep 1
     scons target=template_release tools=no arch=x86_64 module_mono_enabled=yes precision=double use_mingw=yes separate_debug_symbols=yes -j8
     scons target=template_debug tools=no arch=x86_64 module_mono_enabled=yes precision=double use_mingw=yes separate_debug_symbols=yes -j8
+
+    # Android export templates
+    scons platform=android target=template_release arch=arm32 tools=no module_mono_enabled=yes precision=double use_mingw=yes separate_debug_symbols=yes -j8
+    scons platform=android target=template_release arch=arm64 tools=no module_mono_enabled=yes precision=double use_mingw=yes separate_debug_symbols=yes -j8
+    cd platform/android/java
+    # On Windows
+    ./gradlew generateGodotTemplates
+    cd $working_dir
+
+    scons platform=android target=template_debug arch=arm32 tools=no module_mono_enabled=yes precision=double use_mingw=yes separate_debug_symbols=yes -j8
+    scons platform=android target=template_debug arch=arm64 tools=no module_mono_enabled=yes precision=double use_mingw=yes separate_debug_symbols=yes -j8
+    cd platform/android/java
+    # On Windows
+    ./gradlew generateGodotTemplates
+    cd $working_dir
+
 fi
 
 # I should also have it refresh the project but that might be more difficult depending on the project
\ No newline at end of file