diff --git a/config/etc/crypttab b/config/etc/crypttab
index 646ef98..5c7757a 100644
--- a/config/etc/crypttab
+++ b/config/etc/crypttab
@@ -1,2 +1,2 @@
 # <target>      <source device>         <key file>      <options>
-md0-unlocked /dev/md0 none luks,discard
+root-unlocked UUID=%root_uuid% none luks,discard
diff --git a/config/etc/fstab b/config/etc/fstab
index f661da4..c58acd2 100644
--- a/config/etc/fstab
+++ b/config/etc/fstab
@@ -3,6 +3,6 @@
 #
 # <file system> <dir>   <type>  <options>       <dump>  <pass>
 
-UUID=%root_uuid% / btrfs relatime 0 0
+/dev/mapper/root-unlocked / btrfs relatime 0 0
 UUID=%boot_uuid% /boot btrfs relatime 0 0
 UUID=%esp_uuid% /boot/efi vfat relatime 0 0
diff --git a/post-debootstrap-installer.sh b/post-debootstrap-installer.sh
index 7f1b2dd..bc831a7 100755
--- a/post-debootstrap-installer.sh
+++ b/post-debootstrap-installer.sh
@@ -54,7 +54,7 @@ fi
 root_uuid=$(blkid --output value "/dev/mapper/root-unlocked" | head -n1)
 boot_uuid=$(blkid --output value "/hardware-setup/hardware/${1}/boot" | head -n1)
 esp_uuid=$(blkid --output value "/hardware-setup/hardware/${1}/esp" | head -n1)
-sed -i "s/%root_uuid%/${root_uuid}/" /etc/fstab
+sed -i "s/%root_uuid%/${root_uuid}/" /etc/crypttab
 sed -i "s/%boot_uuid%/${boot_uuid}/" /etc/fstab
 sed -i "s/%esp_uuid%/${esp_uuid}/" /etc/fstab