diff --git a/nixos/machines/chungus/disko-config.nix b/nixos/machines/chungus/disko-config.nix
index c8c60e2..1f2909b 100644
--- a/nixos/machines/chungus/disko-config.nix
+++ b/nixos/machines/chungus/disko-config.nix
@@ -97,6 +97,15 @@ in
               compression = "lz4";
             };
           };
+          "services2" = {
+            type = "zfs_fs";
+            mountpoint = "/srv2";
+            options = {
+              mountpoint = "legacy";
+              compression = "lz4";
+              "com.sun:auto-snapshot:daily" = true;
+            };
+          };
         };
       };
 
diff --git a/nixos/machines/chungus/hass-zigbee2mqtt.nix b/nixos/machines/chungus/hass-zigbee2mqtt.nix
index 7d94ecd..4c6fe3e 100644
--- a/nixos/machines/chungus/hass-zigbee2mqtt.nix
+++ b/nixos/machines/chungus/hass-zigbee2mqtt.nix
@@ -5,7 +5,7 @@
 
   services.zigbee2mqtt = {
     enable = true;
-    dataDir = "/srv/zigbee2mqtt";
+    dataDir = "/srv2/zigbee2mqtt";
     settings = {
 
       # Home Assistant integration (MQTT discovery)
diff --git a/nixos/machines/chungus/hass.nix b/nixos/machines/chungus/hass.nix
index 753a322..116de36 100644
--- a/nixos/machines/chungus/hass.nix
+++ b/nixos/machines/chungus/hass.nix
@@ -3,7 +3,7 @@
 
   virtualisation.oci-containers = {
     containers.homeassistant = {
-      volumes = [ "/srv/home-assistant:/config" ];
+      volumes = [ "/srv2/home-assistant:/config" ];
       environment.TZ = "Europe/Berlin";
       image = "ghcr.io/home-assistant/home-assistant:stable"; # Warning: if the tag does not change, the image will not be updated
       extraOptions = [ "--network=host" ];
diff --git a/nixos/machines/chungus/media-tdarr.nix b/nixos/machines/chungus/media-tdarr.nix
index fa8a7b9..4413f86 100644
--- a/nixos/machines/chungus/media-tdarr.nix
+++ b/nixos/machines/chungus/media-tdarr.nix
@@ -5,10 +5,10 @@
   virtualisation.oci-containers = {
     containers.tdarr = {
       volumes = [
-        "/srv/tdarr/server:/app/server"
-        "/srv/tdarr/configs:/app/configs"
-        "/srv/tdarr/logs:/app/logs"
-        "/srv/tdarr/transcode_cache:/temp"
+        "/srv2/tdarr/server:/app/server"
+        "/srv2/tdarr/configs:/app/configs"
+        "/srv2/tdarr/logs:/app/logs"
+        "/srv2/tdarr/transcode_cache:/temp"
         "/media:/media"
       ];
       environment = {