diff --git a/modules/hardware-configuration.nix b/modules/hardware-configuration.nix
index 87ac5f8..8b28fd4 100644
--- a/modules/hardware-configuration.nix
+++ b/modules/hardware-configuration.nix
@@ -23,8 +23,18 @@
       fsType = "vfat";
     };
 
-  fileSystems."/vault" =
-    { device = "vault";
+  fileSystems."/var/lib/containers" =
+    { device = "vault/containers";
+      fsType = "zfs";
+    };
+
+  fileSystems."/var/lib/gitea" =
+    { device = "vault/state_directories/gitea";
+      fsType = "zfs";
+    };
+
+  fileSystems."/var/lib/matrix-as-telegram" =
+    { device = "vault/state_directories/matrix-as-telegram";
       fsType = "zfs";
     };
 
@@ -38,33 +48,13 @@
       fsType = "zfs";
     };
 
-  fileSystems."/var/lib/matrix-as-telegram" =
-    { device = "vault/state_directories/matrix-as-telegram";
-      fsType = "zfs";
-    };
-
-  fileSystems."/var/lib/containers" =
-    { device = "vault/containers";
-      fsType = "zfs";
-    };
-
   fileSystems."/var/lib/wallabag" =
     { device = "vault/state_directories/wallabag";
       fsType = "zfs";
     };
 
-  fileSystems."/var/lib/gitea" =
-    { device = "vault/state_directories/gitea";
-      fsType = "zfs";
-    };
-
-  fileSystems."/var/lib/signald" =
-    { device = "vault/state_directories/signald";
-      fsType = "zfs";
-    };
-
-  fileSystems."/vault/syncthing" =
-    { device = "vault/syncthing";
+  fileSystems."/vault" =
+    { device = "vault";
       fsType = "zfs";
     };
 
@@ -78,11 +68,16 @@
       fsType = "tmpfs";
     };
 
-  fileSystems."/vault/git" =
-    { device = "vault/git";
+  fileSystems."/var/lib/signald" =
+    { device = "vault/state_directories/signald";
       fsType = "zfs";
     };
 
+  fileSystems."/var/lib/containers/storage/zfs-containers/1dece57fa7124ac19a7f9b1b97b32d1ea137775ec33a35375741f3e74be3e85e/userdata/shm" =
+    { device = "shm";
+      fsType = "tmpfs";
+    };
+
   fileSystems."/var/lib/containers/storage/zfs-containers/522343abee32edddd051c93a47bc7d2208e0bbcef724e4c4319cbbc49f5d361d/userdata/shm" =
     { device = "shm";
       fsType = "tmpfs";
@@ -93,8 +88,13 @@
       fsType = "tmpfs";
     };
 
-  fileSystems."/vault/backups" =
-    { device = "vault/backups";
+  fileSystems."/vault/git" =
+    { device = "vault/git";
+      fsType = "zfs";
+    };
+
+  fileSystems."/vault/syncthing" =
+    { device = "vault/syncthing";
       fsType = "zfs";
     };
 
@@ -103,8 +103,8 @@
       fsType = "zfs";
     };
 
-  fileSystems."/vault/backups/zion" =
-    { device = "vault/backups/zion";
+  fileSystems."/vault/backups" =
+    { device = "vault/backups";
       fsType = "zfs";
     };
 
@@ -113,18 +113,23 @@
       fsType = "zfs";
     };
 
+  fileSystems."/vault/backups/zion" =
+    { device = "vault/backups/zion";
+      fsType = "zfs";
+    };
+
   fileSystems."/vault/backups/zion/databases" =
     { device = "vault/backups/zion/databases";
       fsType = "zfs";
     };
 
-  fileSystems."/var/lib/containers/storage/zfs-containers/1dece57fa7124ac19a7f9b1b97b32d1ea137775ec33a35375741f3e74be3e85e/userdata/shm" =
+  fileSystems."/var/lib/containers/storage/zfs-containers/18aaf1ac7583433d84488ea6594032549dc37d959751c096780f03cfa8a31ae7/userdata/shm" =
     { device = "shm";
       fsType = "tmpfs";
     };
 
-  fileSystems."/var/lib/containers/storage/zfs/graph/55d4a7a3d27c0581144429911443c5b08fee9f6ff23a800d6a943267dbb5cdfd" =
-    { device = "vault/containers/55d4a7a3d27c0581144429911443c5b08fee9f6ff23a800d6a943267dbb5cdfd";
+  fileSystems."/var/lib/containers/storage/zfs/graph/9aa4f86c914c513dc7b9ac213850d9f011668f4fd8757c6dcccae60e89eac623" =
+    { device = "vault/containers/9aa4f86c914c513dc7b9ac213850d9f011668f4fd8757c6dcccae60e89eac623";
       fsType = "zfs";
     };
 
@@ -137,7 +142,7 @@
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.cni-podman0.useDHCP = lib.mkDefault true;
   # networking.interfaces.eth0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.veth3fa9be3c.useDHCP = lib.mkDefault true;
+  # networking.interfaces.vethede24a17.useDHCP = lib.mkDefault true;
   # networking.interfaces.wg0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;