diff --git a/devices/ellaca/default.nix b/devices/ellaca/default.nix
index 8203bf7..e8a2e4b 100644
--- a/devices/ellaca/default.nix
+++ b/devices/ellaca/default.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }: {
   imports = [
     ./hardware-config.nix
-    ./disko.nix
     ./nvidia.nix
     ./options.nix
   ];
diff --git a/devices/ellaca/disko.nix b/devices/ellaca/disko.nix
index 4c8d7ae..8db7d7b 100644
--- a/devices/ellaca/disko.nix
+++ b/devices/ellaca/disko.nix
@@ -41,7 +41,7 @@
                   };
                 };
 
-                mountpoint = "/rootfs";
+                mountpoint = "/partition-root";
                 swap = {
                   swapfile = {
                     size = "16G";
diff --git a/devices/ellaca/hardware-config.nix b/devices/ellaca/hardware-config.nix
index cea1e2a..f2c0e1d 100644
--- a/devices/ellaca/hardware-config.nix
+++ b/devices/ellaca/hardware-config.nix
@@ -4,32 +4,32 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  # fileSystems = {
-  #   "/boot" = {
-  #     device = "/dev/disk/by-uuid/646D-4793";
-  #     fsType = "vfat";
-  #   };
-  #   "/" = {
-  #     device = "/dev/disk/by-uuid/1a5777297-4ed3-48d7-adc7-a937fa93d868";
-  #     fsType = "btrfs";
-  #     options = [ "subvol=rootfs" "compress=zstd" "noatime" ];
-  #   };
-  #   "/nix" = {
-  #     device = "/dev/disk/by-uuid/1a5777297-4ed3-48d7-adc7-a937fa93d868";
-  #     fsType = "btrfs";
-  #     options = [ "subvol=nix" "compress=zstd" "noatime" ];
-  #   };
-  #   "/persist" = {
-  #     device = "/dev/disk/by-uuid/1a5777297-4ed3-48d7-adc7-a937fa93d868";
-  #     fsType = "btrfs";
-  #     options = [ "subvol=persist" "compress=zstd" "noatime" ];
-  #   };
-  #   "/ext" = {
-  #     device = "/dev/disk/by-uuid/89112638-6953-48a7-9b2f-dd61ce9fe8b0";
-  #     fsType = "btrfs";
-  #     options = [ "subvol=ext" "compress=zstd" "noatime" ];
-  #   };
-  # };
+  fileSystems = {
+    "/boot" = {
+      device = "/dev/disk/by-uuid/646D-4793";
+      fsType = "vfat";
+    };
+    "/" = {
+      device = "/dev/disk/by-uuid/1a5777297-4ed3-48d7-adc7-a937fa93d868";
+      fsType = "btrfs";
+      options = [ "subvol=rootfs" "compress=zstd" "noatime" ];
+    };
+    "/nix" = {
+      device = "/dev/disk/by-uuid/1a5777297-4ed3-48d7-adc7-a937fa93d868";
+      fsType = "btrfs";
+      options = [ "subvol=nix" "compress=zstd" "noatime" ];
+    };
+    "/persist" = {
+      device = "/dev/disk/by-uuid/1a5777297-4ed3-48d7-adc7-a937fa93d868";
+      fsType = "btrfs";
+      options = [ "subvol=persist" "compress=zstd" "noatime" ];
+    };
+    "/ext" = {
+      device = "/dev/disk/by-uuid/89112638-6953-48a7-9b2f-dd61ce9fe8b0";
+      fsType = "btrfs";
+      options = [ "subvol=ext" "compress=zstd" "noatime" ];
+    };
+  };
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's