diff --git a/bin/artixstrap b/bin/artixstrap
index 26367e5..9849daa 100755
--- a/bin/artixstrap
+++ b/bin/artixstrap
@@ -78,7 +78,7 @@ EOF
 }
 
 __network() {
-    if [ $NM -gt 0 ]
+    if [ -n "$NM" ]
     then
         basestrap "$MOUNT" "networkmanager-$INIT" "network-manager-applet"
         enable NetworkManager
@@ -197,7 +197,9 @@ stage2() {
     # bootloader
     EFINST=
     [ -n "$EFI" ] && EFINST=efibootmgr
-    basestrap "$MOUNT" grub os-prober $KERNEL $EFINST lvm2 cryptsetup
+    [ -n "$LVM" ] && LVMI=lvm2
+    [ -n "$LUKS" ] && LUKSINST=cryptsetup
+    basestrap "$MOUNT" grub os-prober $KERNEL $EFINST $LVMI $LUKSINST
     if [ -n "$EFI" ]
     then
         if [ -n "$CUSTOM_EFIVARS" ]
diff --git a/lib/artixstrap-common b/lib/artixstrap-common
index 4b1f6f2..4f6f51d 100644
--- a/lib/artixstrap-common
+++ b/lib/artixstrap-common
@@ -9,8 +9,8 @@ export DEVICE=/dev/aiur/artix-vm-01
 export DEV_ROOT=/dev/aiur/artix-vm-01
 #export DEV_ROOT=/dev/loop0
 # TODO
-export LVM=1
-export LUKS=1
+export LVM=yes
+export LUKS=yes
 # EFI FAT partition or empty for BIOS
 export EFI=/dev/aiur/artix-vm-boot
 #export EFI=/dev/loop0p1
@@ -28,7 +28,7 @@ export KERNEL=linux
 TIMEZONE=Europe/Budapest
 export HOSTNAME=test
 # whether to install NetworkManager
-export NM=0
+export NM=
 # Arch repos support
 export ARCH=1
 # Instantos repos