diff --git a/build-linux/build.sh b/build-linux/build.sh
index 3d8aabd..35fb683 100755
--- a/build-linux/build.sh
+++ b/build-linux/build.sh
@@ -16,6 +16,9 @@ mkdir godot
 cd godot
 tar xf /root/godot.tar.gz --strip-components=1
 
+# pkg-config wrongly points to lib instead of lib64 for arch-dependent header.
+sed -i ${GODOT_SDK_LINUX_X86_64}/x86_64-godot-linux-gnu/sysroot/usr/lib/pkgconfig/dbus-1.pc -e "s@/lib@/lib64@g"
+
 # Classical
 
 if [ "${CLASSICAL}" == "1" ]; then
@@ -23,26 +26,26 @@ if [ "${CLASSICAL}" == "1" ]; then
 
   export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
 
-  $SCONS platform=x11 $OPTIONS tools=yes target=release_debug
+  $SCONS platform=linuxbsd $OPTIONS tools=yes target=release_debug
   mkdir -p /root/out/x64/tools
   cp -rvp bin/* /root/out/x64/tools
   rm -rf bin
 
-  $SCONS platform=x11 $OPTIONS tools=no target=release_debug
-  $SCONS platform=x11 $OPTIONS tools=no target=release
+  $SCONS platform=linuxbsd $OPTIONS tools=no target=release_debug
+  $SCONS platform=linuxbsd $OPTIONS tools=no target=release
   mkdir -p /root/out/x64/templates
   cp -rvp bin/* /root/out/x64/templates
   rm -rf bin
 
   export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
 
-  $SCONS platform=x11 $OPTIONS tools=yes target=release_debug bits=32
+  $SCONS platform=linuxbsd $OPTIONS tools=yes target=release_debug bits=32
   mkdir -p /root/out/x86/tools
   cp -rvp bin/* /root/out/x86/tools
   rm -rf bin
 
-  $SCONS platform=x11 $OPTIONS tools=no target=release_debug bits=32
-  $SCONS platform=x11 $OPTIONS tools=no target=release bits=32
+  $SCONS platform=linuxbsd $OPTIONS tools=no target=release_debug bits=32
+  $SCONS platform=linuxbsd $OPTIONS tools=no target=release bits=32
   mkdir -p /root/out/x86/templates
   cp -rvp bin/* /root/out/x86/templates
   rm -rf bin
@@ -60,13 +63,13 @@ if [ "${MONO}" == "1" ]; then
   export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
   export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86_64}"
 
-  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes
+  $SCONS platform=linuxbsd $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
   mkdir -p /root/out/x64/tools-mono
   cp -rvp bin/* /root/out/x64/tools-mono
   rm -rf bin
 
-  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=no target=release_debug
-  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=no target=release
+  $SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release_debug
+  $SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release
   mkdir -p /root/out/x64/templates-mono
   cp -rvp bin/* /root/out/x64/templates-mono
   rm -rf bin
@@ -74,13 +77,13 @@ if [ "${MONO}" == "1" ]; then
   export PATH="${GODOT_SDK_LINUX_X86}/bin:${BASE_PATH}"
   export OPTIONS_MONO_PREFIX="${OPTIONS} ${OPTIONS_MONO} mono_prefix=${MONO_PREFIX_X86}"
 
-  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes bits=32
+  $SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=yes target=release_debug copy_mono_root=yes bits=32
   mkdir -p /root/out/x86/tools-mono
   cp -rvp bin/* /root/out/x86/tools-mono
   rm -rf bin
 
-  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=no target=release_debug bits=32
-  $SCONS platform=x11 $OPTIONS_MONO_PREFIX tools=no target=release bits=32
+  $SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release_debug bits=32
+  $SCONS platform=linuxbsd $OPTIONS_MONO_PREFIX tools=no target=release bits=32
   mkdir -p /root/out/x86/templates-mono
   cp -rvp bin/* /root/out/x86/templates-mono
   rm -rf bin
diff --git a/build-mono-glue/build.sh b/build-mono-glue/build.sh
index 0f7ce38..62eccbd 100755
--- a/build-mono-glue/build.sh
+++ b/build-mono-glue/build.sh
@@ -22,10 +22,10 @@ if [ "${MONO}" == "1" ]; then
   mono --version
   export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig/
 
-  ${SCONS} platform=x11 bits=64 ${OPTIONS} target=release_debug tools=yes module_mono_enabled=yes mono_glue=no
+  ${SCONS} platform=linuxbsd bits=64 ${OPTIONS} target=release_debug tools=yes module_mono_enabled=yes mono_glue=no
 
   rm -rf /root/mono-glue/*
-  xvfb-run bin/godot.x11.opt.tools.64.mono --audio-driver Dummy --generate-mono-glue /root/mono-glue || /bin/true
+  bin/godot.linuxbsd.opt.tools.64.mono --display-driver headless --audio-driver Dummy --generate-mono-glue /root/mono-glue || /bin/true
 fi
 
 echo "Mono glue generated successfully"
diff --git a/build-release.sh b/build-release.sh
index 7ab842f..d50b80c 100755
--- a/build-release.sh
+++ b/build-release.sh
@@ -169,24 +169,24 @@ if [ "${build_classical}" == "1" ]; then
   ## Linux (Classical) ##
 
   # Editor
-  binname="${godot_basename}_x11.64"
-  cp out/linux/x64/tools/godot.x11.opt.tools.64 ${binname}
+  binname="${godot_basename}_linux.64"
+  cp out/linux/x64/tools/godot.linuxbsd.opt.tools.64 ${binname}
   strip ${binname}
   zip -q -9 "${reldir}/${binname}.zip" ${binname}
   rm ${binname}
 
-  binname="${godot_basename}_x11.32"
-  cp out/linux/x86/tools/godot.x11.opt.tools.32 ${binname}
+  binname="${godot_basename}_linux.32"
+  cp out/linux/x86/tools/godot.linuxbsd.opt.tools.32 ${binname}
   strip ${binname}
   zip -q -9 "${reldir}/${binname}.zip" ${binname}
   rm ${binname}
 
   # Templates
-  cp out/linux/x64/templates/godot.x11.opt.64 ${templatesdir}/linux_x11_64_release
-  cp out/linux/x64/templates/godot.x11.opt.debug.64 ${templatesdir}/linux_x11_64_debug
-  cp out/linux/x86/templates/godot.x11.opt.32 ${templatesdir}/linux_x11_32_release
-  cp out/linux/x86/templates/godot.x11.opt.debug.32 ${templatesdir}/linux_x11_32_debug
-  strip ${templatesdir}/linux_x11_*
+  cp out/linux/x64/templates/godot.linuxbsd.opt.64 ${templatesdir}/linux_x11_64_release
+  cp out/linux/x64/templates/godot.linuxbsd.opt.debug.64 ${templatesdir}/linux_x11_64_debug
+  cp out/linux/x86/templates/godot.linuxbsd.opt.32 ${templatesdir}/linux_x11_32_release
+  cp out/linux/x86/templates/godot.linuxbsd.opt.debug.32 ${templatesdir}/linux_x11_32_debug
+  strip ${templatesdir}/linux_x11*
 
   ## Windows (Classical) ##
 
@@ -245,39 +245,23 @@ if [ "${build_classical}" == "1" ]; then
   rm -rf osx_template.app
   sign_macos_template ${templatesdir} 0
 
-  ## Server (Classical) ##
-
-  # Headless (editor)
-  binname="${godot_basename}_linux_headless.64"
-  cp out/server/x64/tools/godot_server.x11.opt.tools.64 ${binname}
-  strip ${binname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname}
-  rm ${binname}
-
-  # Server (template)
-  binname="${godot_basename}_linux_server.64"
-  cp out/server/x64/templates/godot_server.x11.opt.64 ${binname}
-  strip ${binname}
-  zip -q -9 "${reldir}/${binname}.zip" ${binname}
-  rm ${binname}
-
-  ## Javascript (Classical) ##
-
-  # Editor
-  unzip out/javascript/tools/godot.javascript.opt.tools.threads.zip -d ${webdir}/
-  brotli --keep --force --quality=11 ${webdir}/*
-  binname="${godot_basename}_web_editor.zip"
-  cp out/javascript/tools/godot.javascript.opt.tools.threads.zip ${reldir}/${binname}
-
-  # Templates
-  cp out/javascript/templates/godot.javascript.opt.zip ${templatesdir}/webassembly_release.zip
-  cp out/javascript/templates/godot.javascript.opt.debug.zip ${templatesdir}/webassembly_debug.zip
-
-  cp out/javascript/templates/godot.javascript.opt.threads.zip ${templatesdir}/webassembly_threads_release.zip
-  cp out/javascript/templates/godot.javascript.opt.debug.threads.zip ${templatesdir}/webassembly_threads_debug.zip
-
-  cp out/javascript/templates/godot.javascript.opt.gdnative.zip ${templatesdir}/webassembly_gdnative_release.zip
-  cp out/javascript/templates/godot.javascript.opt.debug.gdnative.zip ${templatesdir}/webassembly_gdnative_debug.zip
+#  ## Javascript (Classical) ##
+#
+#  # Editor
+#  unzip out/javascript/tools/godot.javascript.opt.tools.threads.zip -d ${webdir}/
+#  brotli --keep --force --quality=11 ${webdir}/*
+#  binname="${godot_basename}_web_editor.zip"
+#  cp out/javascript/tools/godot.javascript.opt.tools.threads.zip ${reldir}/${binname}
+#
+#  # Templates
+#  cp out/javascript/templates/godot.javascript.opt.zip ${templatesdir}/webassembly_release.zip
+#  cp out/javascript/templates/godot.javascript.opt.debug.zip ${templatesdir}/webassembly_debug.zip
+#
+#  cp out/javascript/templates/godot.javascript.opt.threads.zip ${templatesdir}/webassembly_threads_release.zip
+#  cp out/javascript/templates/godot.javascript.opt.debug.threads.zip ${templatesdir}/webassembly_threads_debug.zip
+#
+#  cp out/javascript/templates/godot.javascript.opt.gdnative.zip ${templatesdir}/webassembly_gdnative_release.zip
+#  cp out/javascript/templates/godot.javascript.opt.debug.gdnative.zip ${templatesdir}/webassembly_gdnative_debug.zip
 
   ## Android (Classical) ##
 
@@ -305,42 +289,42 @@ if [ "${build_classical}" == "1" ]; then
   cd ..
   rm -rf ios_xcode
 
-  ## UWP (Classical) ##
-
-  if [ ! -d "deps/angle" ]; then
-    echo "Downloading ANGLE binaries from https://github.com/GodotBuilder/godot-builds/releases/tag/_tools"
-    mkdir -p deps && cd deps
-    curl -LO https://github.com/GodotBuilder/godot-builds/releases/download/_tools/angle.7z
-    7z x angle.7z && rm -f angle.7z
-    cd ..
-  fi
-
-  rm -rf uwp_template_*
-  for arch in ARM Win32 x64; do
-    cp -r git/misc/dist/uwp_template uwp_template_${arch}
-    cp deps/angle/winrt/10/src/Release_${arch}/libEGL.dll \
-      deps/angle/winrt/10/src/Release_${arch}/libGLESv2.dll \
-      uwp_template_${arch}/
-    cp -r uwp_template_${arch} uwp_template_${arch}_debug
-  done
-
-  cp out/uwp/arm/godot.uwp.opt.32.arm.exe uwp_template_ARM/godot.uwp.exe
-  cp out/uwp/arm/godot.uwp.opt.debug.32.arm.exe uwp_template_ARM_debug/godot.uwp.exe
-  cd uwp_template_ARM && zip -q -9 -r "${templatesdir}/uwp_arm_release.zip" * && cd ..
-  cd uwp_template_ARM_debug && zip -q -9 -r "${templatesdir}/uwp_arm_debug.zip" * && cd ..
-  rm -rf uwp_template_ARM*
-
-  cp out/uwp/x86/godot.uwp.opt.32.x86.exe uwp_template_Win32/godot.uwp.exe
-  cp out/uwp/x86/godot.uwp.opt.debug.32.x86.exe uwp_template_Win32_debug/godot.uwp.exe
-  cd uwp_template_Win32 && zip -q -9 -r "${templatesdir}/uwp_x86_release.zip" * && cd ..
-  cd uwp_template_Win32_debug && zip -q -9 -r "${templatesdir}/uwp_x86_debug.zip" * && cd ..
-  rm -rf uwp_template_Win32*
-
-  cp out/uwp/x64/godot.uwp.opt.64.x64.exe uwp_template_x64/godot.uwp.exe
-  cp out/uwp/x64/godot.uwp.opt.debug.64.x64.exe uwp_template_x64_debug/godot.uwp.exe
-  cd uwp_template_x64 && zip -q -9 -r "${templatesdir}/uwp_x64_release.zip" * && cd ..
-  cd uwp_template_x64_debug && zip -q -9 -r "${templatesdir}/uwp_x64_debug.zip" * && cd ..
-  rm -rf uwp_template_x64*
+#  ## UWP (Classical) ##
+#
+#  if [ ! -d "deps/angle" ]; then
+#    echo "Downloading ANGLE binaries from https://github.com/GodotBuilder/godot-builds/releases/tag/_tools"
+#    mkdir -p deps && cd deps
+#    curl -LO https://github.com/GodotBuilder/godot-builds/releases/download/_tools/angle.7z
+#    7z x angle.7z && rm -f angle.7z
+#    cd ..
+#  fi
+#
+#  rm -rf uwp_template_*
+#  for arch in ARM Win32 x64; do
+#    cp -r git/misc/dist/uwp_template uwp_template_${arch}
+#    cp deps/angle/winrt/10/src/Release_${arch}/libEGL.dll \
+#      deps/angle/winrt/10/src/Release_${arch}/libGLESv2.dll \
+#      uwp_template_${arch}/
+#    cp -r uwp_template_${arch} uwp_template_${arch}_debug
+#  done
+#
+#  cp out/uwp/arm/godot.uwp.opt.32.arm.exe uwp_template_ARM/godot.uwp.exe
+#  cp out/uwp/arm/godot.uwp.opt.debug.32.arm.exe uwp_template_ARM_debug/godot.uwp.exe
+#  cd uwp_template_ARM && zip -q -9 -r "${templatesdir}/uwp_arm_release.zip" * && cd ..
+#  cd uwp_template_ARM_debug && zip -q -9 -r "${templatesdir}/uwp_arm_debug.zip" * && cd ..
+#  rm -rf uwp_template_ARM*
+#
+#  cp out/uwp/x86/godot.uwp.opt.32.x86.exe uwp_template_Win32/godot.uwp.exe
+#  cp out/uwp/x86/godot.uwp.opt.debug.32.x86.exe uwp_template_Win32_debug/godot.uwp.exe
+#  cd uwp_template_Win32 && zip -q -9 -r "${templatesdir}/uwp_x86_release.zip" * && cd ..
+#  cd uwp_template_Win32_debug && zip -q -9 -r "${templatesdir}/uwp_x86_debug.zip" * && cd ..
+#  rm -rf uwp_template_Win32*
+#
+#  cp out/uwp/x64/godot.uwp.opt.64.x64.exe uwp_template_x64/godot.uwp.exe
+#  cp out/uwp/x64/godot.uwp.opt.debug.64.x64.exe uwp_template_x64_debug/godot.uwp.exe
+#  cd uwp_template_x64 && zip -q -9 -r "${templatesdir}/uwp_x64_release.zip" * && cd ..
+#  cd uwp_template_x64_debug && zip -q -9 -r "${templatesdir}/uwp_x64_debug.zip" * && cd ..
+#  rm -rf uwp_template_x64*
 
   ## Templates TPZ (Classical) ##
 
@@ -366,18 +350,18 @@ if [ "${build_mono}" == "1" ]; then
   ## Linux (Mono) ##
 
   # Editor
-  binbasename="${godot_basename}_mono_x11"
+  binbasename="${godot_basename}_mono_linux"
   mkdir -p ${binbasename}_64
-  cp out/linux/x64/tools-mono/godot.x11.opt.tools.64.mono ${binbasename}_64/${binbasename}.64
+  cp out/linux/x64/tools-mono/godot.linuxbsd.opt.tools.64.mono ${binbasename}_64/${binbasename}.64
   strip ${binbasename}_64/${binbasename}.64
   cp -rp out/linux/x64/tools-mono/GodotSharp ${binbasename}_64/
   cp -rp out/aot-compilers ${binbasename}_64/GodotSharp/Tools/
   zip -r -q -9 "${reldir_mono}/${binbasename}_64.zip" ${binbasename}_64
   rm -rf ${binbasename}_64
 
-  binbasename="${godot_basename}_mono_x11"
+  binbasename="${godot_basename}_mono_linux"
   mkdir -p ${binbasename}_32
-  cp out/linux/x86/tools-mono/godot.x11.opt.tools.32.mono ${binbasename}_32/${binbasename}.32
+  cp out/linux/x86/tools-mono/godot.linuxbsd.opt.tools.32.mono ${binbasename}_32/${binbasename}.32
   strip ${binbasename}_32/${binbasename}.32
   cp -rp out/linux/x86/tools-mono/GodotSharp/ ${binbasename}_32/
   cp -rp out/aot-compilers ${binbasename}_32/GodotSharp/Tools/
@@ -385,12 +369,12 @@ if [ "${build_mono}" == "1" ]; then
   rm -rf ${binbasename}_32
 
   # Templates
-  cp -rp out/linux/x64/templates-mono/data.mono.x11.64.* ${templatesdir_mono}/
-  cp out/linux/x64/templates-mono/godot.x11.opt.debug.64.mono ${templatesdir_mono}/linux_x11_64_debug
-  cp out/linux/x64/templates-mono/godot.x11.opt.64.mono ${templatesdir_mono}/linux_x11_64_release
-  cp -rp out/linux/x86/templates-mono/data.mono.x11.32.* ${templatesdir_mono}/
-  cp out/linux/x86/templates-mono/godot.x11.opt.debug.32.mono ${templatesdir_mono}/linux_x11_32_debug
-  cp out/linux/x86/templates-mono/godot.x11.opt.32.mono ${templatesdir_mono}/linux_x11_32_release
+  cp -rp out/linux/x64/templates-mono/data.mono.linuxbsd.64.* ${templatesdir_mono}/
+  cp out/linux/x64/templates-mono/godot.linuxbsd.opt.debug.64.mono ${templatesdir_mono}/linux_x11_64_debug
+  cp out/linux/x64/templates-mono/godot.linuxbsd.opt.64.mono ${templatesdir_mono}/linux_x11_64_release
+  cp -rp out/linux/x86/templates-mono/data.mono.linuxbsd.32.* ${templatesdir_mono}/
+  cp out/linux/x86/templates-mono/godot.linuxbsd.opt.debug.32.mono ${templatesdir_mono}/linux_x11_32_debug
+  cp out/linux/x86/templates-mono/godot.linuxbsd.opt.32.mono ${templatesdir_mono}/linux_x11_32_release
   strip ${templatesdir_mono}/linux_x11*
 
   mkdir -p ${templatesdir_mono}/bcl
@@ -468,35 +452,14 @@ if [ "${build_mono}" == "1" ]; then
   rm -rf osx_template.app
   sign_macos_template ${templatesdir_mono} 1
 
-  ## Server (Mono) ##
-
-  # Headless (editor)
-  binbasename="${godot_basename}_mono_linux_headless"
-  mkdir -p ${binbasename}_64
-  cp out/server/x64/tools-mono/godot_server.x11.opt.tools.64.mono ${binbasename}_64/${binbasename}.64
-  strip ${binbasename}_64/${binbasename}.64
-  cp -rp out/server/x64/tools-mono/GodotSharp ${binbasename}_64/
-  cp -rp out/aot-compilers ${binbasename}_64/GodotSharp/Tools/
-  zip -r -q -9 "${reldir_mono}/${binbasename}_64.zip" ${binbasename}_64
-  rm -rf ${binbasename}_64
-
-  # Server (template)
-  binbasename="${godot_basename}_mono_linux_server"
-  mkdir -p ${binbasename}_64
-  cp out/server/x64/templates-mono/godot_server.x11.opt.64.mono ${binbasename}_64/${binbasename}.64
-  strip ${binbasename}_64/${binbasename}.64
-  cp -rp out/server/x64/templates-mono/data.mono.server.64.release ${binbasename}_64/data_${binbasename}_64
-  zip -r -q -9 "${reldir_mono}/${binbasename}_64.zip" ${binbasename}_64
-  rm -rf ${binbasename}_64
-
-  ## Javascript (Mono) ##
-
-  # Templates
-  cp out/javascript/templates-mono/godot.javascript.opt.debug.mono.zip ${templatesdir_mono}/webassembly_debug.zip
-  cp out/javascript/templates-mono/godot.javascript.opt.mono.zip ${templatesdir_mono}/webassembly_release.zip
-
-  mkdir -p ${templatesdir_mono}/bcl
-  cp -r out/javascript/templates-mono/bcl/wasm ${templatesdir_mono}/bcl/
+#  ## Javascript (Mono) ##
+#
+#  # Templates
+#  cp out/javascript/templates-mono/godot.javascript.opt.debug.mono.zip ${templatesdir_mono}/webassembly_debug.zip
+#  cp out/javascript/templates-mono/godot.javascript.opt.mono.zip ${templatesdir_mono}/webassembly_release.zip
+#
+#  mkdir -p ${templatesdir_mono}/bcl
+#  cp -r out/javascript/templates-mono/bcl/wasm ${templatesdir_mono}/bcl/
 
   ## Android (Mono) ##
 
@@ -532,9 +495,9 @@ if [ "${build_mono}" == "1" ]; then
   cp -r out/ios/templates-mono/bcl/monotouch* ${templatesdir_mono}/bcl/
   cp -r out/ios/templates-mono/iphone-mono-libs ${templatesdir_mono}
 
-  ## UWP (Mono) ##
-
-  # Not supported yet.
+#  ## UWP (Mono) ##
+#
+#  # Not supported yet.
 
   ## Templates TPZ (Mono) ##
 
diff --git a/build-server/build.sh b/build-server/build.sh
deleted file mode 100755
index a6fb3ab..0000000
--- a/build-server/build.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Config
-
-export SCONS="scons -j${NUM_CORES} verbose=yes warnings=no progress=no"
-export OPTIONS="production=yes"
-export OPTIONS_MONO="module_mono_enabled=yes mono_static=yes mono_prefix=/root/mono-installs/desktop-linux-x86_64-release"
-export TERM=xterm
-export PATH="${GODOT_SDK_LINUX_X86_64}/bin:${BASE_PATH}"
-
-rm -rf godot
-mkdir godot
-cd godot
-tar xf /root/godot.tar.gz --strip-components=1
-
-# Classical
-
-if [ "${CLASSICAL}" == "1" ]; then
-  echo "Starting classical build for Server..."
-
-  $SCONS platform=server $OPTIONS tools=yes target=release_debug
-  mkdir -p /root/out/x64/tools
-  cp -rvp bin/* /root/out/x64/tools
-  rm -rf bin
-
-  $SCONS platform=server $OPTIONS tools=no target=release
-  mkdir -p /root/out/x64/templates
-  cp -rvp bin/* /root/out/x64/templates
-  rm -rf bin
-fi
-
-# Mono
-
-if [ "${MONO}" == "1" ]; then
-  echo "Starting Mono build for Server..."
-
-  cp /root/mono-glue/*.cpp modules/mono/glue/
-  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=server $OPTIONS $OPTIONS_MONO tools=yes target=release_debug copy_mono_root=yes
-  mkdir -p /root/out/x64/tools-mono
-  cp -rvp bin/* /root/out/x64/tools-mono
-  rm -rf bin
-
-  $SCONS platform=server $OPTIONS $OPTIONS_MONO tools=no target=release
-  mkdir -p /root/out/x64/templates-mono
-  cp -rvp bin/* /root/out/x64/templates-mono
-  rm -rf bin
-fi
-
-echo "Server build successful"
diff --git a/build.sh b/build.sh
index 0f8abd7..b5fcddb 100755
--- a/build.sh
+++ b/build.sh
@@ -193,8 +193,8 @@ ${podman_run} -v ${basedir}/build-windows:/root/build -v ${basedir}/out/windows:
 mkdir -p ${basedir}/out/linux
 ${podman_run} -v ${basedir}/build-linux:/root/build -v ${basedir}/out/linux:/root/out localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/linux
 
-mkdir -p ${basedir}/out/javascript
-${podman_run} -v ${basedir}/build-javascript:/root/build -v ${basedir}/out/javascript:/root/out localhost/godot-javascript:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/javascript
+#mkdir -p ${basedir}/out/javascript
+#${podman_run} -v ${basedir}/build-javascript:/root/build -v ${basedir}/out/javascript:/root/out localhost/godot-javascript:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/javascript
 
 mkdir -p ${basedir}/out/macosx
 ${podman_run} -v ${basedir}/build-macosx:/root/build -v ${basedir}/out/macosx:/root/out localhost/godot-osx:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/macosx
@@ -205,11 +205,8 @@ ${podman_run} -v ${basedir}/build-android:/root/build -v ${basedir}/out/android:
 mkdir -p ${basedir}/out/ios
 ${podman_run} -v ${basedir}/build-ios:/root/build -v ${basedir}/out/ios:/root/out localhost/godot-ios:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/ios
 
-mkdir -p ${basedir}/out/server
-${podman_run} -v ${basedir}/build-server:/root/build -v ${basedir}/out/server:/root/out localhost/godot-linux:${img_version} bash build/build.sh 2>&1 | tee ${basedir}/out/logs/server
-
-mkdir -p ${basedir}/out/uwp
-${podman_run} --ulimit nofile=32768:32768 -v ${basedir}/build-uwp:/root/build -v ${basedir}/out/uwp:/root/out ${registry}/godot-private/uwp:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/uwp
+#mkdir -p ${basedir}/out/uwp
+#${podman_run} --ulimit nofile=32768:32768 -v ${basedir}/build-uwp:/root/build -v ${basedir}/out/uwp:/root/out ${registry}/godot-private/uwp:latest bash build/build.sh 2>&1 | tee ${basedir}/out/logs/uwp
 
 if [ ! -z "$SUDO_UID" ]; then
   chown -R "${SUDO_UID}":"${SUDO_GID}" ${basedir}/git ${basedir}/out ${basedir}/mono-glue ${basedir}/godot*.tar.gz