diff --git a/hosts/dacbert/default.nix b/hosts/dacbert/default.nix
index f49045d0..3e074fb9 100644
--- a/hosts/dacbert/default.nix
+++ b/hosts/dacbert/default.nix
@@ -35,9 +35,12 @@ let
 in
 {
   c3d2 = {
-    hq.interface = "eth0";
-    hq.statistics.enable = true;
     audioServer.enable = true;
+    baremetal = true;
+    hq = {
+      interface = "eth0";
+      statistics.enable = true;
+    };
     k-ot.enable = true;
     # TODO: move back to radiobert with the HW
     pi-sensors = if true then [] else [ {
diff --git a/hosts/glotzbert/default.nix b/hosts/glotzbert/default.nix
index d8d93e33..b5f95bfb 100644
--- a/hosts/glotzbert/default.nix
+++ b/hosts/glotzbert/default.nix
@@ -4,9 +4,10 @@
   imports = [ ./hardware-configuration.nix ];
 
   c3d2 = {
+    autoUpdate = true;
+    baremetal = true;
     hq.interface = "enp0s25";
     k-ot.enable = true;
-    autoUpdate = true;
   };
 
   disko.disks = [ {
diff --git a/hosts/pipebert/default.nix b/hosts/pipebert/default.nix
index 61d8d371..9b9a39f6 100644
--- a/hosts/pipebert/default.nix
+++ b/hosts/pipebert/default.nix
@@ -6,10 +6,13 @@
   ];
 
   c3d2 = {
-    hq.interface = "eth0";
-    hq.statistics.enable = true;
-    k-ot.enable = true;
     audioServer.enable = true;
+    baremetal = true;
+    hq = {
+      interface = "eth0";
+      statistics.enable = true;
+    };
+    k-ot.enable = true;
   };
 
   boot.loader = {