diff --git a/etc/modprobe.d/server-blacklist.conf b/etc/modprobe.d/server-blacklist.conf
index 8a6341e..7bab914 100644
--- a/etc/modprobe.d/server-blacklist.conf
+++ b/etc/modprobe.d/server-blacklist.conf
@@ -301,6 +301,7 @@ install analogix-anx78xx /bin/false
 install analogix_dp /bin/false
 install anx7411 /bin/false
 install aoe /bin/false
+install apanel /bin/false
 install apds9300 /bin/false
 install apds9802als /bin/false
 install apds990x /bin/false
@@ -1505,6 +1506,7 @@ install hid-multitouch /bin/false
 install hid-nintendo /bin/false
 install hid-nti /bin/false
 install hid-ntrig /bin/false
+install hid-nvidia-shield /bin/false
 install hid-ortek /bin/false
 install hidp /bin/false
 install hid-penmount /bin/false
@@ -1533,6 +1535,7 @@ install hid-roccat-pyra /bin/false
 install hid-roccat-ryos /bin/false
 install hid-roccat-savu /bin/false
 install hid-saitek /bin/false
+install hid-samsung /bin/false
 install hid-semitek /bin/false
 install hid-sensor-accel-3d /bin/false
 install hid-sensor-als /bin/false
@@ -1550,6 +1553,7 @@ install hid-sensor-temperature /bin/false
 install hid-sensor-trigger /bin/false
 install hid-sigmamicro /bin/false
 install hid-sjoy /bin/false
+install hid-sony /bin/false
 install hid-speedlink /bin/false
 install hid-steam /bin/false
 install hid-steelseries /bin/false
@@ -1645,6 +1649,7 @@ install i2c-mux-pca954x /bin/false
 install i2c-mux-reg /bin/false
 install i2c-nforce2 /bin/false
 install i2c-nforce2-s4985 /bin/false
+install i2c-nvidia-gpu /bin/false
 install i2c-ocores /bin/false
 install i2c-parport /bin/false
 install i2c-pca-platform /bin/false
@@ -1691,6 +1696,7 @@ install ibmaem /bin/false
 install ibmasm /bin/false
 install ibmasr /bin/false
 install ibm-cffps /bin/false
+install ibm-panel /bin/false
 install ibmpex /bin/false
 install ibm_rtl /bin/false
 install ib_mthca /bin/false
@@ -1703,6 +1709,8 @@ install ice /bin/false
 install icp10100 /bin/false
 install icplus /bin/false
 install ics932s401 /bin/false
+install ideapad-laptop /bin/false
+install ideapad_slidebar /bin/false
 install idma64 /bin/false
 install idmouse /bin/false
 install idpf /bin/false
@@ -1903,6 +1911,7 @@ install ir-rcmm-decoder /bin/false
 install ir-sanyo-decoder /bin/false
 install irsd200 /bin/false
 install ir-sharp-decoder /bin/false
+install ir-sony-decoder /bin/false
 install ir_toy /bin/false
 install ir-usb /bin/false
 install ir-xmp-decoder /bin/false
@@ -1949,6 +1958,12 @@ install ivtv /bin/false
 install ivtv-alsa /bin/false
 install iw_cm /bin/false
 install iw_cxgb4 /bin/false
+install iwl3945 /bin/false
+install iwl4965 /bin/false
+install iwldvm /bin/false
+install iwlegacy /bin/false
+install iwlmvm /bin/false
+install iwlwifi /bin/false
 install ix2505v /bin/false
 install ixgbe /bin/false
 install ixgbevf /bin/false
@@ -2847,6 +2862,7 @@ install ntb_transport /bin/false
 install ntc_thermistor /bin/false
 install null_blk /bin/false
 install nuvoton-cir /bin/false
+install nvidia-wmi-ec-backlight /bin/false
 install nvram /bin/false
 install nvsw-sn2201 /bin/false
 install nv_tco /bin/false
@@ -2941,6 +2957,12 @@ install palmas-pwrbutton /bin/false
 install palmas-regulator /bin/false
 install panasonic-laptop /bin/false
 install pandora_bl /bin/false
+install panel-auo-a030jtn01 /bin/false
+install panel-ilitek-ili9341 /bin/false
+install panel-mipi-dbi /bin/false
+install panel-orisetech-ota5601a /bin/false
+install panel-raspberrypi-touchscreen /bin/false
+install panel-widechips-ws2401 /bin/false
 install parkbd /bin/false
 install parport /bin/false
 install parport_cs /bin/false
@@ -3709,6 +3731,10 @@ install saa7164 /bin/false
 install saa717x /bin/false
 install saa7706h /bin/false
 install safe_serial /bin/false
+install samsung-keypad /bin/false
+install samsung-laptop /bin/false
+install samsung-q10 /bin/false
+install samsung-sxgbe /bin/false
 install sb1000 /bin/false
 install sbc60xxwdt /bin/false
 install sbc_epx_c3 /bin/false
@@ -4456,6 +4482,8 @@ install softing /bin/false
 install softing_cs /bin/false
 install solo6x10 /bin/false
 install solos-pci /bin/false
+install sony-btf-mpx /bin/false
+install sony-laptop /bin/false
 install soundwire-bus /bin/false
 install soundwire-cadence /bin/false
 install soundwire-generic-allocation /bin/false
@@ -4806,6 +4834,9 @@ install tmp421 /bin/false
 install tmp464 /bin/false
 install tmp513 /bin/false
 install topstar-laptop /bin/false
+install toshiba_bluetooth /bin/false
+install toshiba_haps /bin/false
+install toshiba-wmi /bin/false
 install toshsd /bin/false
 install touchit213 /bin/false
 install touchright /bin/false
@@ -4917,6 +4948,7 @@ install twl-regulator /bin/false
 install txgbe /bin/false
 install typec /bin/false
 install typec_displayport /bin/false
+install typec_nvidia /bin/false
 install typec_ucsi /bin/false
 install typec_wcove /bin/false
 install typhoon /bin/false
diff --git a/etc/modprobe.d/workstation-blacklist.conf b/etc/modprobe.d/workstation-blacklist.conf
index f0d4d11..6707652 100644
--- a/etc/modprobe.d/workstation-blacklist.conf
+++ b/etc/modprobe.d/workstation-blacklist.conf
@@ -393,6 +393,7 @@ install anybuss_core /bin/false
 install ao-cec /bin/false
 install ao-cec-g12a /bin/false
 install aoe /bin/false
+install apanel /bin/false
 install apbps2 /bin/false
 install apcs-msm8916 /bin/false
 install apcs-msm8996 /bin/false
@@ -400,21 +401,6 @@ install apds9300 /bin/false
 install apds9802als /bin/false
 install apds990x /bin/false
 install apds9960 /bin/false
-install apple-admac /bin/false
-install apple_bl /bin/false
-install apple-dart /bin/false
-install appledisplay /bin/false
-install apple-gmux /bin/false
-install apple-mailbox /bin/false
-install apple-mfi-fastcharge /bin/false
-install apple-rtkit /bin/false
-install apple-sart /bin/false
-install applesmc /bin/false
-install apple-soc-cpufreq /bin/false
-install applespi /bin/false
-install appletalk /bin/false
-install appletouch /bin/false
-install apple_wdt /bin/false
 install applicom /bin/false
 install apr /bin/false
 install apss-ipq6018 /bin/false
@@ -662,8 +648,6 @@ install block2mtd /bin/false
 install blocklayoutdriver /bin/false
 install bluecard_cs /bin/false
 install bluefield_edac /bin/false
-install bluetooth /bin/false
-install bluetooth_6lowpan /bin/false
 install bma150 /bin/false
 install bma180 /bin/false
 install bma220_spi /bin/false
@@ -755,7 +739,6 @@ install btrsi /bin/false
 install btrtl /bin/false
 install btsdio /bin/false
 install bttv /bin/false
-install btusb /bin/false
 install bu21013_ts /bin/false
 install bu21029_ts /bin/false
 install budget /bin/false
@@ -900,7 +883,6 @@ install cirrus /bin/false
 install cirrusfb /bin/false
 install classmate-laptop /bin/false
 install clip /bin/false
-install clk-apple-nco /bin/false
 install clk-axi-clkgen /bin/false
 install clk-bcm2711-dvp /bin/false
 install clk-bd718x7 /bin/false
@@ -2225,8 +2207,6 @@ install hid /bin/false
 install hid-a4tech /bin/false
 install hid-accutouch /bin/false
 install hid-alps /bin/false
-install hid-apple /bin/false
-install hid-appleir /bin/false
 install hid-asus /bin/false
 install hid-aureal /bin/false
 install hid-axff /bin/false
@@ -2455,7 +2435,6 @@ install i2c-ali1535 /bin/false
 install i2c-ali1563 /bin/false
 install i2c-ali15x3 /bin/false
 install i2c-altera /bin/false
-install i2c-apple /bin/false
 install i2c-arb-gpio-challenge /bin/false
 install i2c-atr /bin/false
 install i2c-bcm2835 /bin/false
@@ -2577,6 +2556,7 @@ install ibmaem /bin/false
 install ibmasm /bin/false
 install ibmasr /bin/false
 install ibm-cffps /bin/false
+install ibm-panel /bin/false
 install ibmpex /bin/false
 install ibm_rtl /bin/false
 install ib_mthca /bin/false
@@ -4257,6 +4237,80 @@ install palmas-pwrbutton /bin/false
 install palmas-regulator /bin/false
 install panasonic-laptop /bin/false
 install pandora_bl /bin/false
+install panel /bin/false
+install panel-abt-y030xx067a /bin/false
+install panel-arm-versatile /bin/false
+install panel-asus-z00t-tm5p5-n35596 /bin/false
+install panel-auo-a030jtn01 /bin/false
+install panel-boe-bf060y8m-aj0 /bin/false
+install panel-boe-himax8279d /bin/false
+install panel-boe-tv101wum-nl6 /bin/false
+install panel-dsi-cm /bin/false
+install panel-ebbg-ft8719 /bin/false
+install panel-edp /bin/false
+install panel-elida-kd35t133 /bin/false
+install panel-feixin-k101-im2ba02 /bin/false
+install panel-feiyang-fy07024di26a30d /bin/false
+install panel-himax-hx8394 /bin/false
+install panel-ilitek-ili9322 /bin/false
+install panel-ilitek-ili9341 /bin/false
+install panel-ilitek-ili9881c /bin/false
+install panel-ilitek-ili9882t /bin/false
+install panel-innolux-ej030na /bin/false
+install panel-innolux-p079zca /bin/false
+install panel-jadard-jd9365da-h3 /bin/false
+install panel-jdi-fhd-r63452 /bin/false
+install panel-jdi-lpm102a188a /bin/false
+install panel-jdi-lt070me05000 /bin/false
+install panel-khadas-ts050 /bin/false
+install panel-kingdisplay-kd097d04 /bin/false
+install panel-leadtek-ltk050h3146w /bin/false
+install panel-leadtek-ltk500hd1829 /bin/false
+install panel-lg-lb035q02 /bin/false
+install panel-lg-lg4573 /bin/false
+install panel-lvds /bin/false
+install panel-magnachip-d53e6ea8966 /bin/false
+install panel-mantix-mlaf057we51 /bin/false
+install panel-mipi-dbi /bin/false
+install panel-nec-nl8048hl11 /bin/false
+install panel-newvision-nv3051d /bin/false
+install panel-newvision-nv3052c /bin/false
+install panel-novatek-nt35510 /bin/false
+install panel-novatek-nt35560 /bin/false
+install panel-novatek-nt35950 /bin/false
+install panel-novatek-nt36523 /bin/false
+install panel-novatek-nt36672a /bin/false
+install panel-novatek-nt39016 /bin/false
+install panel-olimex-lcd-olinuxino /bin/false
+install panel-orisetech-ota5601a /bin/false
+install panel-orisetech-otm8009a /bin/false
+install panel-osd-osd101t2587-53ts /bin/false
+install panel-panasonic-vvx10f034n00 /bin/false
+install panel-raspberrypi-touchscreen /bin/false
+install panel-raydium-rm67191 /bin/false
+install panel-raydium-rm68200 /bin/false
+install panel-raydium-rm692e5 /bin/false
+install panel-ronbo-rb070d30 /bin/false
+install panel-seiko-43wvf1g /bin/false
+install panel-sharp-lq101r1sx01 /bin/false
+install panel-sharp-ls037v7dw01 /bin/false
+install panel-sharp-ls043t1le01 /bin/false
+install panel-sharp-ls060t1sx01 /bin/false
+install panel-simple /bin/false
+install panel-sitronix-st7701 /bin/false
+install panel-sitronix-st7703 /bin/false
+install panel-sitronix-st7789v /bin/false
+install panel-startek-kd070fhfid015 /bin/false
+install panel-tdo-tl070wsh30 /bin/false
+install panel-tpo-td028ttec1 /bin/false
+install panel-tpo-td043mtea1 /bin/false
+install panel-tpo-tpg110 /bin/false
+install panel-truly-nt35597 /bin/false
+install panel-visionox-r66451 /bin/false
+install panel-visionox-rm69299 /bin/false
+install panel-visionox-vtdr6130 /bin/false
+install panel-widechips-ws2401 /bin/false
+install panel-xinpeng-xpp055c272 /bin/false
 install panfrost /bin/false
 install parade-ps8622 /bin/false
 install parade-ps8640 /bin/false
@@ -4331,7 +4385,6 @@ install pcf8591 /bin/false
 install pch_udc /bin/false
 install pci /bin/false
 install pci200syn /bin/false
-install pcie-apple /bin/false
 install pcie-mediatek-gen3 /bin/false
 install pci_endpoint_test /bin/false
 install pci-epf-mhi /bin/false
@@ -4495,7 +4548,6 @@ install pi3usb30532 /bin/false
 install pi433 /bin/false
 install pim4328 /bin/false
 install pinctrl-alderlake /bin/false
-install pinctrl-apple-gpio /bin/false
 install pinctrl-axp209 /bin/false
 install pinctrl-broxton /bin/false
 install pinctrl-cannonlake /bin/false
@@ -4699,7 +4751,6 @@ install pvcalls-back /bin/false
 install pvcalls-front /bin/false
 install pvrusb2 /bin/false
 install pwc /bin/false
-install pwm-apple /bin/false
 install pwm-atmel-hlcdc /bin/false
 install pwm-atmel-tcb /bin/false
 install pwm-bcm2835 /bin/false
@@ -5239,6 +5290,7 @@ install rotary_encoder /bin/false
 install rp2 /bin/false
 install rpcrdma /bin/false
 install rpcsec_gss_krb5 /bin/false
+install rpi-panel-attiny-regulator /bin/false
 install rpm_master_stats /bin/false
 install rpmpd /bin/false
 install rpm-proc /bin/false
@@ -6007,7 +6059,6 @@ install snd-soc-ak5386 /bin/false
 install snd-soc-ak5558 /bin/false
 install snd-soc-alc5623 /bin/false
 install snd-soc-alc5632 /bin/false
-install snd-soc-apple-mca /bin/false
 install snd-soc-apq8016-sbc /bin/false
 install snd-soc-apq8096 /bin/false
 install snd-soc-arizona /bin/false
diff --git a/generate-kmod-blacklist-aggregate.sh b/generate-kmod-blacklist-aggregate.sh
index a84f2da..be758dd 100755
--- a/generate-kmod-blacklist-aggregate.sh
+++ b/generate-kmod-blacklist-aggregate.sh
@@ -74,11 +74,11 @@ done < kmod-whitelist-all
 if [ "${dataset}" != 'vps' ]; then
     while read -r KMOD; do
     sed -i "s/^${KMOD}.*//gm" blacklist.txt
-    done < kmod-whitelist-hw-vendors-start
+    done < kmod-whitelist-bare-metal-start
 
     while read -r KMOD; do
     sed -i "s/.*${KMOD}.*//gm" blacklist.txt
-    done < kmod-whitelist-hw-vendors-all
+    done < kmod-whitelist-bare-metal-all
 fi
 
 # Apply whitelist for workstation
@@ -95,6 +95,11 @@ fi
 # Delete empty lines
 sed -i '/^$/d' blacklist.txt
 
+# Reapply blacklists that got removed by the whitelist section
+while read -r KMOD; do
+    echo "${KMOD}" >> blacklist.txt
+done < kmod-blacklist-reapply
+
 # Delete old files
 rm -f etc/modprobe.d/"${dataset}"-blacklist.conf
 
diff --git a/kmod-blacklist-reapply b/kmod-blacklist-reapply
new file mode 100644
index 0000000..e69de29
diff --git a/kmod-whitelist-bare-metal-all b/kmod-whitelist-bare-metal-all
new file mode 100644
index 0000000..9e4132f
--- /dev/null
+++ b/kmod-whitelist-bare-metal-all
@@ -0,0 +1,4 @@
+acpi
+amd
+intel
+panel
\ No newline at end of file
diff --git a/kmod-whitelist-bare-metal-start b/kmod-whitelist-bare-metal-start
new file mode 100644
index 0000000..aae59d4
--- /dev/null
+++ b/kmod-whitelist-bare-metal-start
@@ -0,0 +1,2 @@
+dell-
+dell_
\ No newline at end of file
diff --git a/kmod-whitelist-hw-vendors-all b/kmod-whitelist-hw-vendors-all
deleted file mode 100644
index d82a274..0000000
--- a/kmod-whitelist-hw-vendors-all
+++ /dev/null
@@ -1,8 +0,0 @@
-acpi
-amd
-intel
-nvidia
-panel
-samsung
-sony
-wmi
\ No newline at end of file
diff --git a/kmod-whitelist-hw-vendors-start b/kmod-whitelist-hw-vendors-start
deleted file mode 100644
index 08f2829..0000000
--- a/kmod-whitelist-hw-vendors-start
+++ /dev/null
@@ -1,8 +0,0 @@
-dell-
-dell_
-iwl
-lg_laptop
-ideapad
-toshiba
-thinkpad
-system76
\ No newline at end of file
diff --git a/kmod-whitelist-workstation-all b/kmod-whitelist-workstation-all
index 4b4e448..09610cc 100644
--- a/kmod-whitelist-workstation-all
+++ b/kmod-whitelist-workstation-all
@@ -1 +1,6 @@
-bluetooth
\ No newline at end of file
+apple
+bluetooth
+nvidia
+samsung
+sony
+wmi
\ No newline at end of file
diff --git a/kmod-whitelist-workstation-start b/kmod-whitelist-workstation-start
index 334c6e2..c83dac2 100644
--- a/kmod-whitelist-workstation-start
+++ b/kmod-whitelist-workstation-start
@@ -1 +1,7 @@
-btusb
\ No newline at end of file
+btusb
+iwl
+lg_laptop
+ideapad
+toshiba
+thinkpad
+system76
\ No newline at end of file