diff --git a/misc/build-containers/build_all.sh b/misc/build-containers/build_all.sh
index 19e68d4b7..f7dfb51c0 100755
--- a/misc/build-containers/build_all.sh
+++ b/misc/build-containers/build_all.sh
@@ -24,25 +24,22 @@ fi
 #	bash /root/engine_build_scripts/windows.sh "$@" 2>&1 | tee logs/windows.log
 
 # Linux Build
+#docker run ${custom_envvars} \
+#        -v ${basedir}/engine_build_scripts:/root/engine_build_scripts \
+#        -v ${project_root}:/root/project \
+#        -w /root/project pandemonium-linux:${img_version} \
+#        bash /root/engine_build_scripts/linux.sh "$@" 2>&1 | tee logs/linux.log
+
+
+# Javascript Build
 docker run ${custom_envvars} \
         -v ${basedir}/engine_build_scripts:/root/engine_build_scripts \
         -v ${project_root}:/root/project \
-        -w /root/project pandemonium-linux:${img_version} \
-        bash /root/engine_build_scripts/linux.sh "$@" 2>&1 | tee logs/linux.log
+        -w /root/project pandemonium-javascript:${img_version} \
+        bash /root/engine_build_scripts/javascript.sh "$@" 2>&1 | tee logs/javascript.log
 
 exit 1
 
-# Javascript editor
-docker run ${custom_envvars} -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"' . 2>&1 | tee logs/javascript_ed.log
-
-# Javascript templates normal
-docker run ${custom_envvars} -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=javascript "$@"' . 2>&1 | tee logs/javascript_rd.log
-docker run ${custom_envvars} -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;scons tools=no target=release custom_modules_shared=no debug_symbols=no platform=javascript "$@"' . 2>&1 | tee logs/javascript_r.log
-
-# Javascript templates threads
-docker run ${custom_envvars} -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"' . 2>&1 | tee logs/javascript_rd_threads.log
-docker run ${custom_envvars} -v ${project_root}:/root/project -w /root/project pandemonium-javascript:${img_version} bash -c 'source /root/emsdk/emsdk_env.sh;scons tools=no target=release custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@"' . 2>&1 | tee logs/javascript_r_threads.log
-
 # Android editor
 docker run ${custom_envvars} -v ${project_root}:/root/project -w /root/project pandemonium-android:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=armv7 "$@" . 2>&1 | tee logs/android_editor_armv7.log
 docker run ${custom_envvars} -v ${project_root}:/root/project -w /root/project pandemonium-android:${img_version} scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=android android_arch=arm64v8 "$@" . 2>&1 | tee logs/android_editor_arm64v8.log
@@ -135,6 +132,9 @@ files=(
 
   "pandemonium.javascript.opt.tools.threads.zip"
 
+  "pandemonium.javascript.opt.gdnative.zip"
+  "pandemonium.javascript.opt.debug.gdnative.zip"
+
   # Android
   "android_source.zip"
   "android_debug.apk"
diff --git a/misc/build-containers/engine_build_scripts/javascript.sh b/misc/build-containers/engine_build_scripts/javascript.sh
new file mode 100644
index 000000000..f09a9b8f7
--- /dev/null
+++ b/misc/build-containers/engine_build_scripts/javascript.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e
+
+source /root/emsdk/emsdk_env.sh
+
+
+# Javascript editor
+scons tools=yes target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@" . 2>&1 | tee logs/javascript_ed.log
+
+# Javascript templates normal
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=javascript "$@" . 2>&1 | tee logs/javascript_rd.log
+
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=javascript "$@" . 2>&1 | tee logs/javascript_r.log
+
+# TODO lto (production=yes) doesn't seem to work for now with thread builds
+
+# Javascript templates threads
+scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@" . 2>&1 | tee logs/javascript_rd_threads.log
+
+scons tools=no target=release custom_modules_shared=no debug_symbols=no threads_enabled=yes platform=javascript "$@" . 2>&1 | tee logs/javascript_r_threads.log
+
+# Javascript templates gdnative
+scons tools=no target=release_debug custom_modules_shared=no debug_symbols=no gdnative_enabled=yes platform=javascript "$@" . 2>&1 | tee logs/javascript_rd_gdnative.log
+
+scons tools=no target=release custom_modules_shared=no debug_symbols=no gdnative_enabled=yes platform=javascript "$@" . 2>&1 | tee logs/javascript_r_gdnative.log
+