diff --git a/misc/build.func b/misc/build.func
index 2e1354f73..bcc237a7d 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -2784,6 +2784,7 @@ build_container() {
   export PCT_OSVERSION="$var_version"
   export PCT_DISK_SIZE="$DISK_SIZE"
   export IPV6_METHOD="$IPV6_METHOD"
+  export ENABLE_GPU="$ENABLE_GPU"
 
   # DEV_MODE exports (optional, for debugging)
   export BUILD_LOG="$BUILD_LOG"
diff --git a/misc/tools.func b/misc/tools.func
index 1052ba24a..d1de1828c 100644
--- a/misc/tools.func
+++ b/misc/tools.func
@@ -2577,8 +2577,8 @@ function setup_gs() {
 # ------------------------------------------------------------------------------
 function setup_hwaccel() {
   # Check if user explicitly disabled GPU in advanced settings
-  if [[ "${var_gpu:-no}" == "no" ]]; then
-    msg_info "GPU acceleration disabled by user (var_gpu=no) - skipping setup"
+  # ENABLE_GPU is exported from build.func
+  if [[ "${ENABLE_GPU:-no}" == "no" ]]; then
     return 0
   fi