diff --git a/mkhzdr b/mkhzdr
index 53bda414af..3f624acd15 100755
--- a/mkhzdr
+++ b/mkhzdr
@@ -62,7 +62,7 @@ sudo cp ts/build/conf/hzdr/thinstation.conf.buildtime ts/build/
 # run the image build process and use the SMP kernel as well as the private
 # build.conf
 sudo ./setup-chroot -b -o --kernel 64 conf/hzdr/build.conf.private
-#sudo ./setup-chroot -b -o --allmodules --kernel SMP conf/hzdr/build.conf.private
+#sudo ./setup-chroot -b -o --allmodules --kernel 64 conf/hzdr/build.conf.private
 
 # revert changes to buildtime file
 sudo git checkout ts/build/thinstation.conf.buildtime
diff --git a/ts/build/machine/intel_nuc/firmware.list b/ts/build/machine/intel_nuc/firmware.list
index 11f0f889b9..71469d66ba 100644
--- a/ts/build/machine/intel_nuc/firmware.list
+++ b/ts/build/machine/intel_nuc/firmware.list
@@ -3,3 +3,5 @@ firmware rtl8168* rtl_nic
 firmware PALM* radeon
 firmware SUMO_* radeon
 firmware microcode_amd* amd-ucode
+firmware ibt-hw-37.8.10-fw-1.10.3.11.e.bseq intel
+firmware iwlwifi-7265D-12.ucode
diff --git a/ts/build/machine/intel_nuc/module.list b/ts/build/machine/intel_nuc/module.list
index d22b7491dc..8f7bd016e9 100644
--- a/ts/build/machine/intel_nuc/module.list
+++ b/ts/build/machine/intel_nuc/module.list
@@ -1,31 +1,51 @@
 module cpufreq_stats
 module e1000e
-module r8169
 module i915
-module k10temp
 module snd-hda-codec-hdmi
 module snd-hda-codec-realtek
 module snd-hda-codec-generic
 module snd-hda-intel
+module snd-hda-controller
 module snd-hda-codec
 module snd-pcm
 module snd-hwdep
 module snd-timer
 module snd
 module soundcore
+module btusb
+module bluetooth
+module x86_pkg_temp_thermal
+module coretemp
+module kvm
+module kvm-intel
+module arc4
+module iwlmvm
+module mac80211
+module iwlwifi
+module cfg80211
+module crct10dif-pclmul
+module crc32-pclmul
+module crc32c-intel
+module rfkill
+module ghash-clmulni-intel
+module mei-me
+module mei
+module gpio-lynxpoint
+module i2c-designware-platform
+module i2c-designware-core
+module acpi_pad
 module sd_mod
-module radeon
+module uas
 module psmouse
 module lpc_ich
 module i2c-i801
 module i2c-hid
-module i2c-piix4
 module ptp
 module drm_kms_helper
 module pps_core
 module drm
+module shpchp
 module mfd-core
-module intel-agp
 module i2c-algo-bit
 module intel-gtt
 module sdhci-acpi
@@ -33,36 +53,30 @@ module sdhci
 module dw_dmac
 module dw_dmac_core
 module battery
-module i2c-core
 module mmc_core
-module ptp
-module mfd-core
-module pps_core
 module video
-module acpi-cpufreq
-module ahci
-module libahci
-module libata
 module scsi_mod
 module tpm_tis
 module tpm
 module serio_raw
+module microcode
+module hid-multitouch
+module hid-appleir
+module hid-logitech-dj
+module r8169
+module k10temp
+module radeon
+module i2c-piix4
+module intel-agp
+module pps_core
+module acpi-cpufreq
+module ahci
+module libahci
+module libata
 module mii
 module ttm
 module snd-usb-audio
 module snd-usbmidi-lib
 module snd-rawmidi
 module snd-seq-device
-module microcode
 module usb-storage
-module hid-magicmouse
-module hid-chicony
-module hid-kensington
-module hid-multitouch
-module hid-cypress
-module hid-a4tech
-module hid-chicony
-module hid-ntrig
-module hid-hyperv
-module hid-appleir
-module hid-logitech-dj