diff --git a/hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh b/hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh
old mode 100644
new mode 100755
index cc5c59f..c9879b6
--- a/hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh
+++ b/hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh
@@ -7,6 +7,9 @@ set -e
 # free 7GB
 
 chroot="$1"
+boot="hardware/${2}/boot"
+esp="hardware/${2}/esp"
+root="hardware/${2}/root"
 
 # encrypt and unlock the root partitions
 echo -n 'Enter LUKS password: '
@@ -20,14 +23,17 @@ unset root_pwd
 
 
 # root device btrfs raid1
-mkfs.btrfs /dev/sda1
-mount /dev/sda1 "$chroot"
-btrfs device add /dev/sdb1 "$chroot" -f
+mkfs.btrfs /dev/mapper/root-unlocked-sda1
+mount /dev/mapper/root-unlocked-sda1 "$chroot"
+btrfs device add /dev/mapper/root-unlocked-sdb1 "$chroot" -f
 btrfs balance start -dconvert=raid1 -mconvert=raid1 "$chroot"
 
 # boot device ext4
+echo mkfs.ext4 "$boot" 
 mkfs.ext4 "$boot" 
+echo mkdir "$chroot/boot" 
 mkdir "$chroot/boot" 
+echo mount "$boot" "$chroot/boot" 
 mount "$boot" "$chroot/boot" 
  
 # esp device FAT
diff --git a/setup.sh b/setup.sh
index 45865c9..af19794 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 set -e
 
+if [[ -z $1 ]] || [[ -z $2 ]]; then
+    echo "Missing some arguments!"
+    echo "Usage: ./setup.sh <template> <fqdn>"
+    exit 1
+fi
 
 apt-get -y install lvm2 mdadm cryptsetup debootstrap btrfs-progs
 
@@ -13,7 +18,8 @@ esp="hardware/${1}/esp"
 
 # format
 chroot=/mnt/root-unlocked
-"./hardware/${1}/mkfs.sh" "$chroot"
+mkdir "$chroot"
+"./hardware/${1}/mkfs.sh" "$chroot" "$1"
 
 
 # debootstrap