diff --git a/flake.nix b/flake.nix
index 4289f1c..192e18c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -153,6 +153,8 @@
         import ./checks { inherit self inputs system pkgs; }
       );
 
+      diskoConfigurations.default = import .templates/hosts/nixos/disk-config.nix;
+
 
       nixosConfigurations =
         lib.swarselsystems.mkFullHostConfigs (lib.swarselsystems.readHosts "nixos") "nixos";
diff --git a/hosts/nixos/chaostheatre/hardware-configuration.nix b/hosts/nixos/chaostheatre/hardware-configuration.nix
index 676fa44..a6aefd7 100644
--- a/hosts/nixos/chaostheatre/hardware-configuration.nix
+++ b/hosts/nixos/chaostheatre/hardware-configuration.nix
@@ -16,19 +16,6 @@
     extraModulePackages = [ ];
   };
 
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk-by-uuid/d2a8fad0-373e-4bcf-8e75-d9b5ef94199c";
-      fsType = "ext4";
-    };
-
-    "/boot" = {
-      device = "/dev/disk-by-uuid/5CF0-A66E";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-  };
-
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking