diff --git a/userdata.sh b/userdata.sh
index d8d02fa..e7b9ebb 100644
--- a/userdata.sh
+++ b/userdata.sh
@@ -27,7 +27,7 @@ mkdir /root/.docker/cli-plugins -p
 curl -SL https://github.com/docker/compose/releases/download/v2.16.0/docker-compose-linux-x86_64 -o /root/.docker/cli-plugins/docker-compose
 chmod +x /root/.docker/cli-plugins/docker-compose
 
-# Configure NFS
+# Configure NFS for backup storage
 echo "$NFS_ADDRESS_EXPORT /mnt nfs nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,noresvport 0 0" >> /etc/fstab
 mount /mnt
 
@@ -39,7 +39,7 @@ cd /opt/
 git clone https://github.com/mailcow/mailcow-dockerized
 cd mailcow-dockerized/
 
-# Setup mailcow volumes and disable ipv6
+# Disable ipv6
 sed -i 's/enable_ipv6: true/enable_ipv6: false/g' docker-compose.yml
 
 cat >> docker-compose.override.yml << eof
@@ -49,17 +49,6 @@ services:
     image: bash:latest
     restart: "no"
     entrypoint: ["echo", "ipv6nat disabled in compose.override.yml"]
-volumes:
-  vmail-vol-1:
-    driver_opts:
-      type: none
-      device: /mnt/vmail-vol-1
-      o: bind
-  vmail-index-vol-1:
-    driver_opts:
-      type: none
-      device: /mnt/vmail-index-vol-1
-      o: bind
 eof
 
 sed -i 's/do-ip6: yes/do-ip6: no/g' data/conf/unbound/unbound.conf
@@ -76,7 +65,7 @@ sed -i 's/SKIP_SOGO=n/SKIP_SOGO=y/g' mailcow.conf
 docker compose pull
 docker compose up -d
 sleep 90
-echo -e '1\n0\n' | MAILCOW_BACKUP_LOCATION=/mnt/backup/ ./helper-scripts/backup_and_restore.sh restore
+echo -e '1\n0\n\n\n' | MAILCOW_BACKUP_LOCATION=/mnt/backup/ ./helper-scripts/backup_and_restore.sh restore
 
 # Configure daily backup for mailcow (all besides vmail)
 cat >> /root/mailcow-backup << eof
@@ -85,7 +74,7 @@ rm -rf /mnt/backup_old/*
 mv /mnt/backup/* /mnt/backup_old/
 sync
 cd /opt/mailcow-dockerized
-MAILCOW_BACKUP_LOCATION=/mnt/backup /opt/mailcow-dockerized/helper-scripts/backup_and_restore.sh backup crypt redis rspamd postfix mysql
+MAILCOW_BACKUP_LOCATION=/mnt/backup /opt/mailcow-dockerized/helper-scripts/backup_and_restore.sh backup all
 exit 0
 eof