diff --git a/infra/flake-part.nix b/infra/flake-part.nix
index 857848a..f98b35c 100644
--- a/infra/flake-part.nix
+++ b/infra/flake-part.nix
@@ -17,11 +17,7 @@
           };
           nixpkgs = inputs.nixpkgs;
           nixos.module = {
-            imports = [
-              ./vm02116/configuration.nix
-              ./vm02116/forgejo.nix
-              ./vm02116/hardware-configuration.nix
-            ];
+            imports = [ ./vm02116 ];
           };
         };
 
@@ -35,11 +31,7 @@
           };
           nixpkgs = inputs.nixpkgs;
           nixos.module = {
-            imports = [
-              ./vm02179/configuration.nix
-              ./vm02179/hardware-configuration.nix
-              ./vm02179/gitea-runner.nix
-            ];
+            imports = [ ./vm02179 ];
           };
         };
 
@@ -53,11 +45,7 @@
           };
           nixpkgs = inputs.nixpkgs;
           nixos.module = {
-            imports = [
-              ./vm02186/procolix-configuration.nix
-              ./vm02186/hardware-configuration.nix
-              ./vm02186/gitea-runner.nix
-            ];
+            imports = [ ./vm02186 ];
           };
         };
       };
@@ -79,10 +67,7 @@
           };
           nixpkgs = inputs.nixpkgs;
           nixos.module = {
-            imports = [
-              ./vm02187/configuration.nix
-              ./vm02187/hardware-configuration.nix
-            ];
+            imports = [ ./vm02187 ];
           };
         };
       };
diff --git a/infra/vm02116/configuration.nix b/infra/vm02116/default.nix
similarity index 60%
rename from infra/vm02116/configuration.nix
rename to infra/vm02116/default.nix
index 3a4b6f0..09801fd 100644
--- a/infra/vm02116/configuration.nix
+++ b/infra/vm02116/default.nix
@@ -1,5 +1,8 @@
 {
-  imports = [ ../common ];
+  imports = [
+    ../common
+    ./forgejo.nix
+  ];
 
   procolix.vm = {
     name = "vm02116";
@@ -12,4 +15,14 @@
   ## two options can safely be removed.
   boot.initrd.availableKernelModules = [ "xen_blkfront" ];
   services.xe-guest-utilities.enable = true;
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/2CE2-1173";
+    fsType = "vfat";
+  };
 }
diff --git a/infra/vm02116/hardware-configuration.nix b/infra/vm02116/hardware-configuration.nix
deleted file mode 100644
index 5ad9e85..0000000
--- a/infra/vm02116/hardware-configuration.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/3802a66d-e31a-4650-86f3-b51b11918853";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/2CE2-1173";
-    fsType = "vfat";
-  };
-}
diff --git a/infra/vm02179/configuration.nix b/infra/vm02179/configuration.nix
deleted file mode 100644
index 1974593..0000000
--- a/infra/vm02179/configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [ ../common ];
-
-  procolix.vm = {
-    name = "vm02179";
-    ip4 = "185.206.232.179";
-    ip6 = "2a00:51c0:12:1201::179";
-  };
-}
diff --git a/infra/vm02179/hardware-configuration.nix b/infra/vm02179/default.nix
similarity index 62%
rename from infra/vm02179/hardware-configuration.nix
rename to infra/vm02179/default.nix
index 5b89888..f5065ee 100644
--- a/infra/vm02179/hardware-configuration.nix
+++ b/infra/vm02179/default.nix
@@ -1,4 +1,15 @@
 {
+  imports = [
+    ../common
+    ./gitea-runner.nix
+  ];
+
+  procolix.vm = {
+    name = "vm02179";
+    ip4 = "185.206.232.179";
+    ip6 = "2a00:51c0:12:1201::179";
+  };
+
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/119863f8-55cf-4e2f-ac17-27599a63f241";
     fsType = "ext4";
diff --git a/infra/vm02186/hardware-configuration.nix b/infra/vm02186/default.nix
similarity index 62%
rename from infra/vm02186/hardware-configuration.nix
rename to infra/vm02186/default.nix
index c9538ea..cc93772 100644
--- a/infra/vm02186/hardware-configuration.nix
+++ b/infra/vm02186/default.nix
@@ -1,4 +1,15 @@
 {
+  imports = [
+    ../common
+    ./gitea-runner.nix
+  ];
+
+  procolix.vm = {
+    name = "vm02186";
+    ip4 = "185.206.232.186";
+    ip6 = "2a00:51c0:12:1201::186";
+  };
+
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/833ac0f9-ad8c-45ae-a9bf-5844e378c44a";
     fsType = "ext4";
diff --git a/infra/vm02186/procolix-configuration.nix b/infra/vm02186/procolix-configuration.nix
deleted file mode 100644
index 9cd4bf0..0000000
--- a/infra/vm02186/procolix-configuration.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  imports = [ ../common ];
-
-  procolix.vm = {
-    name = "vm02186";
-    ip4 = "185.206.232.186";
-    ip6 = "2a00:51c0:12:1201::186";
-  };
-}
diff --git a/infra/vm02187/hardware-configuration.nix b/infra/vm02187/default.nix
similarity index 63%
rename from infra/vm02187/hardware-configuration.nix
rename to infra/vm02187/default.nix
index c95e55d..7b43b4c 100644
--- a/infra/vm02187/hardware-configuration.nix
+++ b/infra/vm02187/default.nix
@@ -1,4 +1,15 @@
 {
+  imports = [
+    ../common
+    ./wiki.nix
+  ];
+
+  procolix.vm = {
+    name = "vm02187";
+    ip4 = "185.206.232.187";
+    ip6 = "2a00:51c0:12:1201::187";
+  };
+
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/a46a9c46-e32b-4216-a4aa-8819b2cd0d49";
     fsType = "ext4";
diff --git a/infra/vm02187/configuration.nix b/infra/vm02187/wiki.nix
similarity index 93%
rename from infra/vm02187/configuration.nix
rename to infra/vm02187/wiki.nix
index 6aaf946..858790d 100644
--- a/infra/vm02187/configuration.nix
+++ b/infra/vm02187/wiki.nix
@@ -1,14 +1,6 @@
 { pkgs, ... }:
 
 {
-  imports = [ ../common ];
-
-  procolix.vm = {
-    name = "vm02187";
-    ip4 = "185.206.232.187";
-    ip6 = "2a00:51c0:12:1201::187";
-  };
-
   services.phpfpm.pools.mediawiki.phpOptions = ''
     upload_max_filesize = 1024M;
     post_max_size = 1024M;