diff --git a/docker-bake.hcl b/docker-bake.hcl
index e4f1318b3..e1a40b004 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -10,6 +10,7 @@ group "default" {
     "ubuntu-22-04",
     "ubuntu-24-04",
     "ubuntu-26-04",
+    "ubuntu-26-10",
   ]
 }
 
@@ -21,6 +22,7 @@ group "artifacts" {
     "ubuntu-22-04",
     "ubuntu-24-04",
     "ubuntu-26-04",
+    "ubuntu-26-10",
   ]
 }
 
@@ -86,3 +88,14 @@ target "ubuntu-26-04" {
     "dev.lizardbyte.image.variant" = "ubuntu-26.04"
   }
 }
+
+target "ubuntu-26-10" {
+  inherits = ["_sunshine"]
+  args = {
+    BASE = "ubuntu"
+    TAG = "26.10"
+  }
+  labels = {
+    "dev.lizardbyte.image.variant" = "ubuntu-26.10"
+  }
+}
diff --git a/docker/clion-toolchain.dockerfile b/docker/clion-toolchain.dockerfile
index e86ff803e..9d1d0bafe 100644
--- a/docker/clion-toolchain.dockerfile
+++ b/docker/clion-toolchain.dockerfile
@@ -21,11 +21,11 @@ set -e
 apt-get update -y
 apt-get install -y --no-install-recommends \
   build-essential \
-  cmake=3.31.* \
   ca-certificates \
+  cmake=3.31.* \
   doxygen \
-  gcc=4:14.2.* \
   g++=4:14.2.* \
+  gcc=4:14.2.* \
   gdb \
   git \
   graphviz \
diff --git a/scripts/linux_build.sh b/scripts/linux_build.sh
index 5254a97c0..a32fefd1e 100755
--- a/scripts/linux_build.sh
+++ b/scripts/linux_build.sh
@@ -33,6 +33,10 @@ step="all"
 # constants
 AARCH64="aarch64"
 DOXYGEN="doxygen"
+readonly DISTRO_ARCH="arch"
+readonly DISTRO_DEBIAN="debian"
+readonly DISTRO_FEDORA="fedora"
+readonly DISTRO_UBUNTU="ubuntu"
 
 function setup_cuda_system_package_environment() {
   if [[ "$cuda_system_package" == 1 ]]; then
@@ -182,7 +186,7 @@ Options:
   --cuda-patches           Apply cuda patches. Enabled automatically on Ubuntu 26.04.
   --cuda-runfile           Force CUDA installation from the NVIDIA runfile.
   --cuda-system-package=*  The CUDA package to install when system CUDA is enabled.
-                           Default for Ubuntu 26.04 is cuda-toolkit-13-1.
+                           Default for Ubuntu 26.04 and 26.10 is cuda-toolkit-13-1.
   --num-processors         The number of processors to use for compilation. Default is the value of 'nproc'.
   --publisher-name         The name of the publisher (not developer) of the application.
   --publisher-website      The URL of the publisher's website.
@@ -260,6 +264,10 @@ while getopts ":hs-:" opt; do
       echo "Invalid option: -${OPTARG}" 1>&2
       _usage 1
       ;;
+    *)
+      echo "Invalid option: -${OPTARG}" 1>&2
+      _usage 1
+      ;;
   esac
 done
 shift $((OPTIND -1))
@@ -370,7 +378,7 @@ function add_debian_based_deps() {
   )
 
   # Ubuntu 22.04 uses a different package name for Qt6 SVG
-  if [[ "$distro" == "ubuntu" ]] && [[ "$version" == "22.04" ]]; then
+  if [[ "$distro" == "$DISTRO_UBUNTU" ]] && [[ "$version" == "22.04" ]]; then
     dependencies+=(
       "libgl-dev"  # OpenGL development headers, needed for qt6-svg
       "libqt6svg6-dev"
@@ -504,7 +512,7 @@ function install_cuda() {
   fi
 
   local cuda_override_arg=""
-  if [[ "$distro" == "fedora" ]]; then
+  if [[ "$distro" == "$DISTRO_FEDORA" ]]; then
     cuda_override_arg="--override"
   fi
 
@@ -518,9 +526,9 @@ function install_cuda() {
     # we need to patch the math-vector.h file for aarch64 fedora
     # back up /usr/include/bits/math-vector.h
     math_vector_file=""
-    if [[ "$distro" == "ubuntu" ]] || [[ "$version" == "24.04" ]]; then
+    if [[ "$distro" == "$DISTRO_UBUNTU" ]] || [[ "$version" == "24.04" ]]; then
       math_vector_file="/usr/include/aarch64-linux-gnu/bits/math-vector.h"
-    elif [[ "$distro" == "fedora" ]]; then
+    elif [[ "$distro" == "$DISTRO_FEDORA" ]]; then
       math_vector_file="/usr/include/bits/math-vector.h"
     fi
 
@@ -554,11 +562,11 @@ function check_version() {
 
   echo "Checking if $package_name is installed and at least version $min_version"
 
-  if [[ "$distro" == "debian" ]] || [[ "$distro" == "ubuntu" ]]; then
+  if [[ "$distro" == "$DISTRO_DEBIAN" ]] || [[ "$distro" == "$DISTRO_UBUNTU" ]]; then
     installed_version=$(dpkg -s "$package_name" 2>/dev/null | grep '^Version:' | awk '{print $2}')
-  elif [[ "$distro" == "fedora" ]]; then
+  elif [[ "$distro" == "$DISTRO_FEDORA" ]]; then
     installed_version=$(rpm -q --queryformat '%{VERSION}' "$package_name" 2>/dev/null)
-  elif [[ "$distro" == "arch" ]]; then
+  elif [[ "$distro" == "$DISTRO_ARCH" ]]; then
     installed_version=$(pacman -Q "$package_name" | awk '{print $2}' )
   else
     echo "Unsupported Distro"
@@ -586,13 +594,13 @@ function run_step_deps() {
   # Update the package list
   $package_update_command
 
-  if [[ "$distro" == "arch" ]]; then
+  if [[ "$distro" == "$DISTRO_ARCH" ]]; then
     add_arch_deps
-  elif [[ "$distro" == "debian" ]]; then
+  elif [[ "$distro" == "$DISTRO_DEBIAN" ]]; then
     add_debian_deps
-  elif [[ "$distro" == "ubuntu" ]]; then
+  elif [[ "$distro" == "$DISTRO_UBUNTU" ]]; then
     add_ubuntu_deps
-  elif [[ "$distro" == "fedora" ]]; then
+  elif [[ "$distro" == "$DISTRO_FEDORA" ]]; then
     add_fedora_deps
     ${sudo_cmd} dnf group install "development-tools" -y
   fi
@@ -781,9 +789,9 @@ function run_step_package() {
 
   # Create the package
   if [[ "$skip_package" == 0 ]]; then
-    if [[ "$distro" == "debian" ]] || [[ "$distro" == "ubuntu" ]]; then
+    if [[ "$distro" == "$DISTRO_DEBIAN" ]] || [[ "$distro" == "$DISTRO_UBUNTU" ]]; then
       cpack -G DEB --config ./build/CPackConfig.cmake
-    elif [[ "$distro" == "fedora" ]]; then
+    elif [[ "$distro" == "$DISTRO_FEDORA" ]]; then
       cpack -G RPM --config ./build/CPackConfig.cmake
     fi
   fi
@@ -840,103 +848,87 @@ function run_install() {
 # Determine the OS and call the appropriate function
 cat /etc/os-release
 
-if grep -q "Arch Linux" /etc/os-release; then
-  distro="arch"
-  version=""
-  package_update_command="${sudo_cmd} pacman -Syu --noconfirm"
-  package_install_command="${sudo_cmd} pacman -Sy --needed"
-  nvm_node=0
-  gcc_version="14"
-elif grep -q "Debian GNU/Linux 12 (bookworm)" /etc/os-release; then
-  distro="debian"
-  version="12"
-  package_update_command="${sudo_cmd} apt-get update"
-  package_install_command="${sudo_cmd} apt-get install -y"
-  gcc_version="13"
-  nvm_node=0
-elif grep -q "Debian GNU/Linux 13 (trixie)" /etc/os-release; then
-  distro="debian"
-  version="13"
-  package_update_command="${sudo_cmd} apt-get update"
-  package_install_command="${sudo_cmd} apt-get install -y"
-  gcc_version="14"
-  nvm_node=0
-elif grep -q "PLATFORM_ID=\"platform:f42\"" /etc/os-release; then
-  distro="fedora"
-  version="42"
-  package_update_command="${sudo_cmd} dnf update -y"
-  package_install_command="${sudo_cmd} dnf install -y"
-  gcc_version="14"
-  nvm_node=0
-elif grep -q '^ID=fedora$' /etc/os-release && grep -q '^VERSION_ID=43$' /etc/os-release; then
-  distro="fedora"
-  version="43"
-  package_update_command="${sudo_cmd} dnf update -y"
-  package_install_command="${sudo_cmd} dnf install -y"
-  gcc_version="14"
-  nvm_node=0
-elif grep -q '^ID=fedora$' /etc/os-release && grep -q '^VERSION_ID=44$' /etc/os-release; then
-  distro="fedora"
-  version="44"
-  package_update_command="${sudo_cmd} dnf update -y"
-  package_install_command="${sudo_cmd} dnf install -y"
-  gcc_version="14"
-  nvm_node=0
-elif grep -q '^ID=fedora$' /etc/os-release && grep -q '^VERSION_ID=45$' /etc/os-release; then
-  distro="fedora"
-  version="45"
-  package_update_command="${sudo_cmd} dnf update -y"
-  package_install_command="${sudo_cmd} dnf install -y"
-  cuda_version="13.1.1"
-  cuda_build="590.48.01"
-  gcc_version="15"
-  nvm_node=0
-elif grep -q "Ubuntu 22.04" /etc/os-release; then
-  distro="ubuntu"
-  version="22.04"
-  package_update_command="${sudo_cmd} apt-get update"
-  package_install_command="${sudo_cmd} apt-get install -y"
-  gcc_version="14"
-  nvm_node=1
-elif grep -q "Ubuntu 24.04" /etc/os-release; then
-  distro="ubuntu"
-  version="24.04"
-  package_update_command="${sudo_cmd} apt-get update"
-  package_install_command="${sudo_cmd} apt-get install -y"
-  gcc_version="14"
-  nvm_node=1
-elif grep -q "Ubuntu 25.04" /etc/os-release; then
-  distro="ubuntu"
-  version="25.04"
-  package_update_command="${sudo_cmd} apt-get update"
-  package_install_command="${sudo_cmd} apt-get install -y"
-  gcc_version="14"
-  nvm_node=0
-elif grep -q "Ubuntu 25.10" /etc/os-release; then
-  distro="ubuntu"
-  version="25.10"
-  package_update_command="${sudo_cmd} apt-get update"
-  package_install_command="${sudo_cmd} apt-get install -y"
-  gcc_version="14"
-  nvm_node=0
-elif grep -q 'VERSION_ID="26.04"' /etc/os-release; then
-  distro="ubuntu"
-  version="26.04"
-  package_update_command="${sudo_cmd} apt-get update"
-  package_install_command="${sudo_cmd} apt-get install -y"
-  cuda_patches=1
-  if [[ "$force_cuda_runfile" == 0 ]]; then
-    cuda_system_package=1
-    if [[ -z "$cuda_system_package_name" ]]; then
-      cuda_system_package_name="cuda-toolkit-13-1"
+# shellcheck disable=SC1091  # trusted system file is unavailable to static analysis
+source /etc/os-release
+distro="$ID"
+version="${VERSION_ID:-}"
+
+case "${distro}:${version}" in
+  "${DISTRO_ARCH}":*)
+    version=""
+    package_update_command="${sudo_cmd} pacman -Syu --noconfirm"
+    package_install_command="${sudo_cmd} pacman -Sy --needed"
+    nvm_node=0
+    gcc_version="14"
+    ;;
+  "${DISTRO_DEBIAN}":12)
+    package_update_command="${sudo_cmd} apt-get update"
+    package_install_command="${sudo_cmd} apt-get install -y"
+    gcc_version="13"
+    nvm_node=0
+    ;;
+  "${DISTRO_DEBIAN}":13)
+    package_update_command="${sudo_cmd} apt-get update"
+    package_install_command="${sudo_cmd} apt-get install -y"
+    gcc_version="14"
+    nvm_node=0
+    ;;
+  "${DISTRO_FEDORA}":42|"${DISTRO_FEDORA}":43|"${DISTRO_FEDORA}":44)
+    package_update_command="${sudo_cmd} dnf update -y"
+    package_install_command="${sudo_cmd} dnf install -y"
+    gcc_version="14"
+    nvm_node=0
+    ;;
+  "${DISTRO_FEDORA}":45)
+    package_update_command="${sudo_cmd} dnf update -y"
+    package_install_command="${sudo_cmd} dnf install -y"
+    cuda_version="13.1.1"
+    cuda_build="590.48.01"
+    gcc_version="15"
+    nvm_node=0
+    ;;
+  "${DISTRO_UBUNTU}":22.04|"${DISTRO_UBUNTU}":24.04)
+    package_update_command="${sudo_cmd} apt-get update"
+    package_install_command="${sudo_cmd} apt-get install -y"
+    gcc_version="14"
+    nvm_node=1
+    ;;
+  "${DISTRO_UBUNTU}":25.04|"${DISTRO_UBUNTU}":25.10)
+    package_update_command="${sudo_cmd} apt-get update"
+    package_install_command="${sudo_cmd} apt-get install -y"
+    gcc_version="14"
+    nvm_node=0
+    ;;
+  "${DISTRO_UBUNTU}":26.04)
+    package_update_command="${sudo_cmd} apt-get update"
+    package_install_command="${sudo_cmd} apt-get install -y"
+    cuda_patches=1
+    if [[ "$force_cuda_runfile" == 0 ]]; then
+      cuda_system_package=1
+      if [[ -z "$cuda_system_package_name" ]]; then
+        cuda_system_package_name="cuda-toolkit-13-1"
+      fi
     fi
-  fi
-  gcc_version="14"
-  nvm_node=0
-else
-  echo "Unsupported Distro or Version"
-  exit 1
-fi
+    gcc_version="14"
+    nvm_node=0
+    ;;
+  "${DISTRO_UBUNTU}":26.10)
+    package_update_command="${sudo_cmd} apt-get update"
+    package_install_command="${sudo_cmd} apt-get install -y"
+    if [[ "$force_cuda_runfile" == 0 ]]; then
+      cuda_system_package=1
+      if [[ -z "$cuda_system_package_name" ]]; then
+        cuda_system_package_name="cuda-toolkit-13-1"
+      fi
+    fi
+    gcc_version="14"
+    nvm_node=0
+    ;;
+  *)
+    echo "Unsupported Distro or Version"
+    exit 1
+    ;;
+esac
 
 architecture=$(uname -m)