diff --git a/hosts/binarycache/default.nix b/hosts/binarycache/configuration.nix
similarity index 100%
rename from hosts/binarycache/default.nix
rename to hosts/binarycache/configuration.nix
diff --git a/hosts/build01/default.nix b/hosts/build01/configuration.nix
similarity index 100%
rename from hosts/build01/default.nix
rename to hosts/build01/configuration.nix
diff --git a/hosts/default.nix b/hosts/default.nix
index f15a2303..eaf67a2d 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -13,11 +13,6 @@
     qemu-common = import ./qemu-common.nix;
     common = import ./common.nix;
     generic-disk-config = import ./generic-disk-config.nix;
-    # host modules
-    host-build01 = import ./build01;
-    host-ghafhydra = import ./ghafhydra;
-    host-binarycache = import ./binarycache;
-    host-monitoring = import ./monitoring;
   };
 
   flake.nixosConfigurations = let
@@ -27,19 +22,19 @@
     # Currently not used for anything:
     # build01 = lib.nixosSystem {
     #   inherit specialArgs;
-    #   modules = [self.nixosModules.host-build01];
+    #   modules = [./build01/configuration.nix];
     # };
     ghafhydra = lib.nixosSystem {
       inherit specialArgs;
-      modules = [self.nixosModules.host-ghafhydra];
+      modules = [./ghafhydra/configuration.nix];
     };
     binarycache = lib.nixosSystem {
       inherit specialArgs;
-      modules = [self.nixosModules.host-binarycache];
+      modules = [./binarycache/configuration.nix];
     };
     monitoring = lib.nixosSystem {
       inherit specialArgs;
-      modules = [self.nixosModules.host-monitoring];
+      modules = [./monitoring/configuration.nix];
     };
   };
 }
diff --git a/hosts/ghafhydra/default.nix b/hosts/ghafhydra/configuration.nix
similarity index 100%
rename from hosts/ghafhydra/default.nix
rename to hosts/ghafhydra/configuration.nix
diff --git a/hosts/monitoring/default.nix b/hosts/monitoring/configuration.nix
similarity index 100%
rename from hosts/monitoring/default.nix
rename to hosts/monitoring/configuration.nix