diff --git a/curacao/dk.nix b/curacao/dk.nix
index 2a66f7d..3c24d91 100644
--- a/curacao/dk.nix
+++ b/curacao/dk.nix
@@ -75,7 +75,7 @@ in
                 content = {
                   type = "filesystem";
                   format = "ext2";
-                  mountpoint = "/boot";
+                  mountpoint = "/mnt/old/boot";
                   mountOptions = [
                     "rw"
                     "relatime"
@@ -142,6 +142,7 @@ in
                 type = "luks";
                 name = "rapido";
                 initrdUnlock = true;
+                passwordFile = passwordFile;
                 settings = {
                   keyFile = "/etc/keys/rapido";
                   allowDiscards = true;
@@ -153,17 +154,28 @@ in
                   mountOptions = btrfs_args_ssd;
                   subvolumes = {
                     archlinux = {
-                      mountpoint = "/";
+                      mountpoint = "/mnt/old";
+                      mountOptions = btrfs_args_ssd;
+                    };
+                    # Should be temporary, to make sure we can revert to Arch anytime
+                    "home.nixos" = {
+                      mountpoint = "/home";
                       mountOptions = btrfs_args_ssd;
                     };
                     "home.rapido" = {
-                      mountpoint = "/home";
+                      mountpoint = "/home.old";
                       mountOptions = btrfs_args_ssd;
                     };
                     nix = {
                       mountpoint = "/nix";
                       mountOptions = btrfs_args_ssd;
                     };
+                    nixosboot = {
+                      mountpoint = "/boot";
+                    };
+                    nixos = {
+                      mountpoint = "/";
+                    };
                   };
                 };
               };
diff --git a/curacao/hardware.nix b/curacao/hardware.nix
index 996cf10..f439fa7 100644
--- a/curacao/hardware.nix
+++ b/curacao/hardware.nix
@@ -10,6 +10,8 @@
     grub = {
       enable = true;
       efiSupport = true;
+      device = "nodev"; # Don't install on MBR
+      # TODO Maybe we could? In case the HDD doesn't boot anymore?
     };
   };
 }
diff --git a/curacao/os.nix b/curacao/os.nix
index 3bd283d..3c110b9 100644
--- a/curacao/os.nix
+++ b/curacao/os.nix
@@ -8,4 +8,14 @@
   ];
 
   networking.hostName = "curacao";
+  boot = {
+    initrd.secrets = {
+      "/etc/keys/rapido" = "/etc/keys/rapido";
+      "/etc/keys/rapswap" = "/etc/keys/rapswap";
+    };
+    loader = {
+      grub.enableCryptodisk = true;
+      efi.efiSysMountPoint = "/efi";
+    };
+  };
 }