diff --git a/install.sh b/install.sh
index dea2103..ee3d438 100644
--- a/install.sh
+++ b/install.sh
@@ -146,29 +146,28 @@ o=defaults,x-mount.mkdir
 o_btrfs=$o,compress=zstd,ssd,noatime
 
 mount -t btrfs LABEL=system /mnt
-btrfs subvolume create /mnt/@root
-btrfs subvolume create /mnt/@home
-btrfs subvolume create /mnt/@snapshots
-btrfs subvolume create /mnt/@pkgs
-btrfs subvolume create /mnt/@aurbuild
-btrfs subvolume create /mnt/@archbuild
-btrfs subvolume create /mnt/@docker
-btrfs subvolume create /mnt/@logs
-btrfs subvolume create /mnt/@tmp
+btrfs subvolume create /mnt/root
+btrfs subvolume create /mnt/home
+btrfs subvolume create /mnt/snapshots
+btrfs subvolume create /mnt/pkgs
+btrfs subvolume create /mnt/aurbuild
+btrfs subvolume create /mnt/archbuild
+btrfs subvolume create /mnt/docker
+btrfs subvolume create /mnt/logs
+btrfs subvolume create /mnt/tmp
 umount -R /mnt
 
-mount -t btrfs -o subvol=@root,$o_btrfs LABEL=system /mnt
-mount -t btrfs -o subvol=@home,$o_btrfs LABEL=system /mnt/home
-mount -t btrfs -o subvol=@snapshots,$o_btrfs LABEL=system /mnt/.snapshots
-mount -t btrfs -o subvol=@pkgs,$o_btrfs LABEL=system /mnt/var/cache/pacman
-mount -t btrfs -o subvol=@aurbuild,$o_btrfs LABEL=system /mnt/var/lib/aurbuild
-mount -t btrfs -o subvol=@archbuild,$o_btrfs LABEL=system /mnt/var/lib/archbuild
-mount -t btrfs -o subvol=@docker,$o_btrfs LABEL=system /mnt/var/lib/docker
-mount -t btrfs -o subvol=@logs,$o_btrfs LABEL=system /mnt/var/log
-mount -t btrfs -o subvol=@tmp,$o_btrfs LABEL=system /mnt/var/tmp
+mount -t btrfs -o subvol=root,$o_btrfs LABEL=system /mnt
+mount -t btrfs -o subvol=home,$o_btrfs LABEL=system /mnt/home
+mount -t btrfs -o subvol=snapshots,$o_btrfs LABEL=system /mnt/.snapshots
+mount -t btrfs -o subvol=pkgs,$o_btrfs LABEL=system /mnt/var/cache/pacman
+mount -t btrfs -o subvol=aurbuild,$o_btrfs LABEL=system /mnt/var/lib/aurbuild
+mount -t btrfs -o subvol=archbuild,$o_btrfs LABEL=system /mnt/var/lib/archbuild
+mount -t btrfs -o subvol=docker,$o_btrfs LABEL=system /mnt/var/lib/docker
+mount -t btrfs -o subvol=logs,$o_btrfs LABEL=system /mnt/var/log
+mount -t btrfs -o subvol=tmp,$o_btrfs LABEL=system /mnt/var/tmp
 
-#mount LABEL=EFI /mnt/efi
-mount -o $o LABEL=EFI /mnt/boot
+mount LABEL=EFI /mnt/efi
 
 echo -e "\n### Configuring custom repo"
 mkdir "/mnt/var/cache/pacman/${user}-local"