diff --git a/artix_scripts/pre-chroot.sh b/artix_scripts/pre-chroot.sh
index 6395b7f..9eef041 100755
--- a/artix_scripts/pre-chroot.sh
+++ b/artix_scripts/pre-chroot.sh
@@ -29,22 +29,24 @@ vgcreate $LVM_N /dev/mapper/$CRYPT_N
 
 lvcreate -L 2G  $LVM_N -n volSwap && \
 lvcreate -L 10G  $LVM_N -n volRoot && \
-lvcreate -L 2G  $LVM_N -n volHome && \
+lvcreate -L 2G  $LVM_N -n volHome
 
 #Filesystems and mount
-mkswap /dev/$LVM_N/volSwap
 if [ $BIOSorEFI == "EFI"]; then
     mkfs.fat -n ESP -F 32 $DISK\1
 fi
-mkfs.ext4 -L volRoot /dev/$LVM_N/volRoot && \
+
 mkfs.ext4 -L volHome /dev/$LVM_N/volHome && \
+mkswap /dev/$LVM_N/volSwap
 swapon /dev/$LVM_N/volSwap && \
-mount /dev/$LVM_N/volRoot /mnt && \
 mkdir -p /mnt/home && \
-mount /dev/$LVM_N/volHome /mnt/home && \
+mount /dev/$LVM_N/volHome /mnt/home
+
 if [ $BIOSorEFI == "EFI"]; then
+    mkfs.ext4 -L volRoot /dev/$LVM_N/volRoot && \
+    mount /dev/$LVM_N/volRoot /mnt && \
     mkdir -p /mnt/boot/efi && \
-    mount $DISK\1 /mnt/boot/efi && \
+    mount $DISK\1 /mnt/boot/efi
 fi
 
 #basestrap, fstab, chroot