diff --git a/hosts/miniserver/hardware-configuration.nix b/hosts/miniserver/hardware-configuration.nix
index e85c939..45acfb6 100644
--- a/hosts/miniserver/hardware-configuration.nix
+++ b/hosts/miniserver/hardware-configuration.nix
@@ -29,27 +29,10 @@
         enableCryptodisk = true;
       };
     };
-    initrd.luks.devices = {
-      nvme = {
-        device = "/dev/disk/by-uuid/30fd7d86-9bed-42a6-8a4e-a2ddb0031233";
-        preLVM = true;
-      };
-      # disk1 = {
-      #   device = "/dev/disk/by-uuid/a9b0f346-7e38-40a6-baf6-3ad80cafc842";
-      #   preLVM = true;
-      # };
-      # disk2 = {
-      #   device = "/dev/disk/by-uuid/0ed12b83-4c56-4ba8-b4ea-75a9e927d771";
-      #   preLVM = true;
-      # };
-      # disk3 = {
-      #   device = "/dev/disk/by-uuid/8cd728f6-0d5b-4cea-8f7d-01aad11192c1";
-      #   preLVM = true;
-      # };
-      # disk4 = {
-      #   device = "/dev/disk/by-uuid/7fcac808-491f-4846-a4a9-a34cc77cb43d";
-      #   preLVM = true;
-      # };
+    initrd.luks.devices.nvme = {
+      device = "/dev/disk/by-uuid/30fd7d86-9bed-42a6-8a4e-a2ddb0031233";
+      keyFile = "/boot/keyfile";
+      preLVM = true;
     };
     extraModulePackages = [ ];
     initrd = {
diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix
index 95e66f4..26a8e9b 100644
--- a/hosts/server/hardware-configuration.nix
+++ b/hosts/server/hardware-configuration.nix
@@ -28,22 +28,31 @@
     initrd.luks.devices = {
       nvme = {
         device = "/dev/disk/by-uuid/af72f45c-cf7c-4e7d-8eab-2a95ab754921";
+        keyFile = "/boot/keyfile";
         preLVM = true;
       };
+      # WHEN MIGRATING THE DISKS
+      # remember to delete this keyfile
+      # and replace it with the one on miniserver
+      # or move the keyfile
       disk1 = {
         device = "/dev/disk/by-uuid/a9b0f346-7e38-40a6-baf6-3ad80cafc842";
+        keyFile = "/boot/keyfile";
         preLVM = true;
       };
       disk2 = {
         device = "/dev/disk/by-uuid/0ed12b83-4c56-4ba8-b4ea-75a9e927d771";
+        keyFile = "/boot/keyfile";
         preLVM = true;
       };
       disk3 = {
         device = "/dev/disk/by-uuid/8cd728f6-0d5b-4cea-8f7d-01aad11192c1";
+        keyFile = "/boot/keyfile";
         preLVM = true;
       };
       disk4 = {
         device = "/dev/disk/by-uuid/7fcac808-491f-4846-a4a9-a34cc77cb43d";
+        keyFile = "/boot/keyfile";
         preLVM = true;
       };
     };
diff --git a/hosts/workstation/hardware-configuration.nix b/hosts/workstation/hardware-configuration.nix
index 8d15873..fae5670 100644
--- a/hosts/workstation/hardware-configuration.nix
+++ b/hosts/workstation/hardware-configuration.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, modulesPath, lib, ... }: {
+{ config, modulesPath, lib, ... }: {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
   hardware = {
     cpu.amd.updateMicrocode =
@@ -45,6 +45,7 @@
     };
     initrd.luks.devices.nvme = {
       device = "/dev/disk/by-uuid/e9618e85-a631-4374-b2a4-22c376d6e41b";
+      keyFile = "/boot/keyfile";
       preLVM = true;
     };
     initrd.availableKernelModules =