diff --git a/build-linux/build.sh b/build-linux/build.sh
index 74917f6..26b4f49 100755
--- a/build-linux/build.sh
+++ b/build-linux/build.sh
@@ -29,6 +29,10 @@ cp -rvp bin/godot.x11.* /root/out/
 
 export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
 ${SCONS} platform=server ${OPTIONS} bits=64 tools=yes target=release_debug
+${SCONS} platform=server ${OPTIONS} bits=64 tools=no target=release
+
+export PATH="${GODOT_SDK_LINUX_X86_32}/bin:${BASE_PATH}"
+${SCONS} platform=server ${OPTIONS} bits=32 tools=no target=release
 
 ${STRIP} bin/godot_server.server.*
 cp -rvp bin/godot_server.server.* /root/out/
diff --git a/build-release.sh b/build-release.sh
index 7158c41..15e89bd 100755
--- a/build-release.sh
+++ b/build-release.sh
@@ -236,6 +236,10 @@ if true; then
   zip -q -9 "${reldir}/${binname}.zip" ${binname}
   rm ${binname}
 
+  # Templates
+  cp out/linux/godot_server.server.opt.64 ${templatesdir}/linux_server_64
+  cp out/linux/godot_server.server.opt.32 ${templatesdir}/linux_server_32
+
   ## Templates TPZ (Classical) ##
 
   echo "${templates_version}" > ${templatesdir}/version.txt