diff --git a/CMakeLists.txt b/CMakeLists.txt
index 637e0f285ec0..cc8549624fd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,7 +45,7 @@ if(APPLE)
     set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
     # set(CMAKE_OSX_SYSROOT "iphoneos")
     if(QGC_MACOS_UNIVERSAL_BUILD)
-        set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
+        set(CMAKE_OSX_ARCHITECTURES "x86_64h;arm64") # CMAKE_APPLE_SILICON_PROCESSOR
     endif()
 endif()
 
diff --git a/cmake/CustomOptions.cmake b/cmake/CustomOptions.cmake
index 0e86a25c66c1..d1fc4936167d 100644
--- a/cmake/CustomOptions.cmake
+++ b/cmake/CustomOptions.cmake
@@ -68,7 +68,7 @@ set(QGC_MACOS_PLIST_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/MacOSXBundleInfo.plis
 set(QGC_MACOS_BUNDLE_ID "${QGC_PACKAGE_NAME}" CACHE STRING "MacOS Bundle ID")
 set(QGC_MACOS_ICON_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/qgroundcontrol.icns" CACHE FILEPATH "MacOS Icon Path")
 set(QGC_MACOS_ENTITLEMENTS_PATH "${CMAKE_SOURCE_DIR}/deploy/macos/qgroundcontrol.entitlements" CACHE FILEPATH "MacOS Entitlements Path")
-option(QGC_MACOS_UNIVERSAL_BUILD "Build MacOS Universal Build (arm64;x86_64)" ON)
+option(QGC_MACOS_UNIVERSAL_BUILD "Build MacOS Universal Build (x86_64h;arm64)" ON)
 
 # Linux
 option(QGC_CREATE_APPIMAGE "Build an AppImage after build" ON)
diff --git a/cmake/Toolchain.cmake b/cmake/Toolchain.cmake
index c47ebcc96f42..61762a641a97 100644
--- a/cmake/Toolchain.cmake
+++ b/cmake/Toolchain.cmake
@@ -51,10 +51,4 @@ endif()
 
 if(APPLE AND NOT IOS)
     set(MACOS TRUE)
-
-    # if(CMAKE_APPLE_SILICON_PROCESSOR MATCHES "arm64")
-    # if(CMAKE_APPLE_SILICON_PROCESSOR MATCHES "x86_64")
-    # if("${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm64;x86_64" OR "${CMAKE_OSX_ARCHITECTURES}" MATCHES "x86_64;arm64")
-    #     set(QGC_MACOS_UNIVERSAL_BUILD ON)
-    # endif()
 endif()
diff --git a/tools/setup/install-dependencies-debian.sh b/tools/setup/install-dependencies-debian.sh
index 6b75c0cff739..2b027458f586 100755
--- a/tools/setup/install-dependencies-debian.sh
+++ b/tools/setup/install-dependencies-debian.sh
@@ -1,11 +1,4 @@
 #!/usr/bin/env bash
-#
-# QGroundControl build‑time dependencies for Ubuntu/Debian‑based images
-# --------------------------------------------------------------------
-# * Designed for non‑interactive CI/containers
-# * Uses --no-install-recommends to keep the image lean
-# * Cleans APT cache at the end to minimise final size
-
 set -euo pipefail
 export DEBIAN_FRONTEND=noninteractive