diff --git a/setup-usl-mm b/setup-usl-mm
index 7dcf793..8a858b1 100755
--- a/setup-usl-mm
+++ b/setup-usl-mm
@@ -50,14 +50,14 @@ zfs create crypt/lxd/storage
 
 echo "Install snapd and lxd"
 pacman -S snapd --noconfirm
+systemctl enable snapd
 systemctl start snapd
 sleep 5
 snap install lxd
 
 echo "Stopping and disabling lxd"
-systemctl disable snap.lxd.daemon
-systemctl disable snap.lxd.daemon.unix.socket
-systemctl stop snap.lxd.daemon
+snap stop --disable lxd
+snap disable lxd
 
 echo "Deleting everything in /var/snap/lxd/common/lxd/*"
 rm /var/snap/lxd/common/lxd/* -r
@@ -97,15 +97,14 @@ echo "echo \"Passwords not match!\"" >> /root/onstart
 echo "exit 1" >> /root/onstart
 echo "fi"  >> /root/onstart
 echo "echo \"Stopping LXD snap daemon and deleting /var/snap/lxd/common/lxd/*\"" >> /root/onstart
-echo "systemctl stop snap.lxd.daemon" >> /root/onstart
+echo "snap disable lxd" >> /root/onstart
 echo "rm /var/snap/lxd/common/lxd/* -rf" >> /root/onstart
 echo "echo \"Opening encrypted partition\"" >> /root/onstart
 echo "echo \$pass_var | cryptsetup open $PARTITION crypt -c -" >> /root/onstart
 echo "partprobe" >> /root/onstart
 echo "zpool import -d /dev/mapper crypt -f -m" >> /root/onstart
-echo "systemctl start snapd" >> /root/onstart
 echo "sleep 5" >> /root/onstart
-echo "systemctl start snap.lxd.daemon" >> /root/onstart
+echo "snap enable lxd" >> /root/onstart
 
 chmod +x /root/onstart
 read -p "Press any key for reboot"