diff --git a/misc/build-containers/build_all.sh b/misc/build-containers/build_all.sh
index 002ebee52..9c589b964 100755
--- a/misc/build-containers/build_all.sh
+++ b/misc/build-containers/build_all.sh
@@ -109,13 +109,21 @@ files=(
   "pandemonium.x11.opt.tools.arm"
   "pandemonium.x11.opt.tools.arm64"
 
-  # Server (Linux) - template
+  # Server (Linux)
+  "pandemonium_server.x11.opt.32"
   "pandemonium_server.x11.opt.64"
+  "pandemonium_server.x11.opt.arm"
+  "pandemonium_server.x11.opt.arm64"
+
+  "pandemonium_server.x11.opt.debug.32"
   "pandemonium_server.x11.opt.debug.64"
+  "pandemonium_server.x11.opt.debug.arm"
+  "pandemonium_server.x11.opt.debug.arm64"
 
-  # Headless (Linux) - editor
-
+  "pandemonium_server.x11.opt.tools.32"
   "pandemonium_server.x11.opt.tools.64"
+  "pandemonium_server.x11.opt.tools.arm"
+  "pandemonium_server.x11.opt.tools.arm64"
 
   # JS
   "pandemonium.javascript.opt.zip"
diff --git a/misc/build-containers/engine_build_scripts/linux.sh b/misc/build-containers/engine_build_scripts/linux.sh
index 92a232ab7..507b6a762 100755
--- a/misc/build-containers/engine_build_scripts/linux.sh
+++ b/misc/build-containers/engine_build_scripts/linux.sh
@@ -19,10 +19,10 @@ scons production=yes tools=yes target=release_debug custom_modules_shared=no deb
 scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@"
 scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=64 "$@"
 
-# Linux headless (editor) 64bit
+# Linux headless (editor) 64 bit
 scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@"
 
-# Linux server (templates) 64bit
+# Linux server (templates) 64 bit
 scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@"
 scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=server bits=64 "$@"
 
@@ -35,6 +35,13 @@ scons production=yes tools=yes target=release_debug custom_modules_shared=no deb
 scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@"
 scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 bits=32 "$@"
 
+# Linux headless (editor) 32 bit
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=32 "$@"
+
+# Linux server (templates) 32 bit
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=server bits=32 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=server bits=32 "$@"
+
 export PATH="${GODOT_SDK_LINUX_ARM64}/bin:${BASE_PATH}"
 
 # Linux editor arm64
@@ -44,6 +51,13 @@ scons production=yes tools=yes target=release_debug custom_modules_shared=no deb
 scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=arm64 "$@"
 scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 arch=arm64 "$@"
 
+# Linux headless (editor) arm64
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=server arch=arm64 "$@"
+
+# Linux server (templates) arm64
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=server arch=arm64 "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=server arch=arm64 "$@"
+
 export PATH="${GODOT_SDK_LINUX_ARM32}/bin:${BASE_PATH}"
 
 # Linux editor arm
@@ -53,3 +67,10 @@ scons production=yes tools=yes target=release_debug custom_modules_shared=no deb
 scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=x11 arch=arm "$@"
 scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=x11 arch=arm "$@"
 
+# Linux headless (editor) arm
+scons production=yes tools=yes target=release_debug custom_modules_shared=no debug_symbols=no platform=server arch=arm "$@"
+
+# Linux server (templates) arm
+scons production=yes tools=no target=release_debug custom_modules_shared=no debug_symbols=no platform=server arch=arm "$@"
+scons production=yes tools=no target=release custom_modules_shared=no debug_symbols=no platform=server arch=arm "$@"
+