diff --git a/hosts/yodaHedgehog/configuration.nix b/hosts/yodaHedgehog/configuration.nix
index 5a146ce..e88efd5 100644
--- a/hosts/yodaHedgehog/configuration.nix
+++ b/hosts/yodaHedgehog/configuration.nix
@@ -43,7 +43,11 @@
   # Note: dualstack lite -> No A record for that subdomain!
   yoda.netcup-dns = ../../secrets/netcup-dns-hedgehog.json;
 
-  boot.kernelParams = [];
+  boot.kernelParams = [
+    # If the CPU is vulnerable, enable all available mitigations
+    # except `nosmt` as we don't run any VMs on this machine.
+    "mds=full"
+  ];
   boot.kernelPackages = pkgs.linuxPackages;
 
   # Most users should never change this value after the initial install, for any reason, even if you've upgraded your system to a new NixOS release.
diff --git a/hosts/yodaNas/configuration.nix b/hosts/yodaNas/configuration.nix
index ed30cf5..7429649 100644
--- a/hosts/yodaNas/configuration.nix
+++ b/hosts/yodaNas/configuration.nix
@@ -48,6 +48,8 @@
   yoda.netcup-dns = ../../secrets/netcup-dns-nas.json;
 
   boot.kernelParams = [
+    # If the CPU is vulnerable, enable all available mitigations.
+    #
     # Microarchitectural Data Sampling (MDS), see https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html#mitigation-control-on-the-kernel-command-line
     "mds=full,nosmt"
   ];
diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index 7d48a80..1e9e79b 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -35,7 +35,7 @@
       ../../modules/uni-vpn.nix
       #../../modules/epa.nix
 
-      ../../modules/autostart.nix
+      #../../modules/autostart.nix
 
       #
       # Development
@@ -50,11 +50,6 @@
       #../../modules/vscodium.nix
       #../../modules/android.nix
       #../../modules/pmbootstrap.nix
-
-      #../../modules/boxes.nix
-      #../../modules/virtualbox.nix
-      ../../modules/docker.nix
-      #../../modules/docker-pushrm.nix
     ];
 
   networking.hostName = "yodaTab";
@@ -73,6 +68,11 @@
   # Motivation behind bare bones systemd-based initrd: https://github.com/NixOS/nixpkgs/pull/164943
   #boot.initrd.systemd.enable = true;
 
+  boot.kernelParams = [
+    # If the CPU is vulnerable, enable all available mitigations
+    # except `nosmt` as we don't run any VMs on this machine.
+    "mds=full"
+  ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
   # Most users should never change this value after the initial install, for any reason, even if you've upgraded your system to a new NixOS release.
diff --git a/hosts/yodaTux/host-specific.nix b/hosts/yodaTux/host-specific.nix
index ae207c0..aa21571 100644
--- a/hosts/yodaTux/host-specific.nix
+++ b/hosts/yodaTux/host-specific.nix
@@ -5,9 +5,16 @@
   yoda.btrfsFileSystems = ["/"];
   #yoda.btrfsMounts = yoda.btrfsFileSystems;
 
-  # Systemd Journal entry:
-  # S Sat Sep 23 16:11:52 2023 p4 kernel: TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'.
-  boot.kernelParams = [ "tsc=unstable" ];
+  boot.kernelParams = [
+    # If the CPU is vulnerable, enable all available mitigations.
+    #
+    # Microarchitectural Data Sampling (MDS), see https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html#mitigation-control-on-the-kernel-command-line
+    "mds=full,nosmt"
+
+    # Systemd Journal entry:
+    # TSC found unstable after boot, most likely due to broken BIOS. Use 'tsc=unstable'.
+    #"tsc=unstable"
+  ];
 
   # Most users should never change this value after the initial install, for any reason, even if you've upgraded your system to a new NixOS release.
   system.stateVersion = "23.05";
diff --git a/hosts/yodaTuxHeadless/configuration.nix b/hosts/yodaTuxHeadless/configuration.nix
index 4867d5b..5c290a8 100644
--- a/hosts/yodaTuxHeadless/configuration.nix
+++ b/hosts/yodaTuxHeadless/configuration.nix
@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 {
   imports = [
-    ./hardware-configuration.nix
-    ./host-specific.nix
+    ../yodaTux/hardware-configuration.nix
+    ../yodaTux/host-specific.nix
     #../../modules/tuxedo-rs.nix
     #../../modules/gpu-amd.nix
 
diff --git a/hosts/yodaTuxHeadless/hardware-configuration.nix b/hosts/yodaTuxHeadless/hardware-configuration.nix
deleted file mode 120000
index 7b60cde..0000000
--- a/hosts/yodaTuxHeadless/hardware-configuration.nix
+++ /dev/null
@@ -1 +0,0 @@
-../yodaTux/hardware-configuration.nix
\ No newline at end of file
diff --git a/hosts/yodaTuxHeadless/host-specific.nix b/hosts/yodaTuxHeadless/host-specific.nix
deleted file mode 120000
index 85d9470..0000000
--- a/hosts/yodaTuxHeadless/host-specific.nix
+++ /dev/null
@@ -1 +0,0 @@
-../yodaTux/host-specific.nix
\ No newline at end of file
diff --git a/hosts/yodaYoga/configuration.nix b/hosts/yodaYoga/configuration.nix
index 71c7a72..dd21f8c 100644
--- a/hosts/yodaYoga/configuration.nix
+++ b/hosts/yodaYoga/configuration.nix
@@ -26,8 +26,9 @@
   #yoda.btrfsMounts = yoda.btrfsFileSystems;
 
   boot.kernelParams = [
-    # Microarchitectural Data Sampling (MDS), see https://www.kernel.org/doc/html/latest/admin-guide/hw-vuln/mds.html#mitigation-control-on-the-kernel-command-line
-    "mds=full,nosmt"
+    # If the CPU is vulnerable, enable all available mitigations
+    # except `nosmt` as we don't run any VMs on this machine.
+    "mds=full"
   ];
   boot.kernelPackages = pkgs.linuxPackages;