diff --git a/files/debian/debian-essentials.sh b/files/debian/debian-essentials.sh
index 2809740..a512bb0 100755
--- a/files/debian/debian-essentials.sh
+++ b/files/debian/debian-essentials.sh
@@ -100,15 +100,10 @@ if [ $isInFile -eq 0 ]; then
     echo "username=akanealw" >> /home/akanealw/.smbcreds
     echo "password=8ung1e1!" >> /home/akanealw/.smbcreds
     chown akanealw:akanealw /home/akanealw/.smbcreds
-    mkdir /mnt/backups > /dev/null 2>&1
-    chown akanealw:akanealw /mnt/backups
-    mkdir /mnt/storage > /dev/null 2>&1
-    chown akanealw:akanealw /mnt/storage
+    mkdir /mnt/data > /dev/null 2>&1
+    chown akanealw:akanealw /mnt/data
     echo "# mapped drives" >> /etc/fstab
-    echo "//192.168.1.41/backups /mnt/backups cifs uid=1000,credentials=/home/akanealw/.smbcreds,iocharset=utf8,vers=2.1,noperm,noauto,x-systemd.automount 0 0" >> /etc/fstab
-    echo "//192.168.1.41/storage /mnt/storage cifs uid=1000,credentials=/home/akanealw/.smbcreds,iocharset=utf8,vers=2.1,noperm,noauto,x-systemd.automount 0 0" >> /etc/fstab
-    mount /mnt/backups -v
-    mount /mnt/storage -v
+    echo "//192.168.1.41/data /mnt/data cifs _netdev,x-systemd.automount,uid=1000,gid=1000,credentials=/home/akanealw/.smbcreds,iocharset=utf8 0 0" >> /etc/fstab
 fi
 
 # ask to install samba
diff --git a/files/ubuntu/ubuntu-essentials.sh b/files/ubuntu/ubuntu-essentials.sh
index 978c4a6..bdde9cd 100755
--- a/files/ubuntu/ubuntu-essentials.sh
+++ b/files/ubuntu/ubuntu-essentials.sh
@@ -114,15 +114,10 @@ if [ $isInFile -eq 0 ]; then
     echo "username=akanealw" >> /home/akanealw/.smbcreds
     echo "password=8ung1e1!" >> /home/akanealw/.smbcreds
     chown akanealw:akanealw /home/akanealw/.smbcreds
-    mkdir /mnt/backups > /dev/null 2>&1
-    chown akanealw:akanealw /mnt/backups
-    mkdir /mnt/storage > /dev/null 2>&1
-    chown akanealw:akanealw /mnt/storage
+    mkdir /mnt/data > /dev/null 2>&1
+    chown akanealw:akanealw /mnt/data
     echo "# mapped drives" >> /etc/fstab
-    echo "//192.168.1.41/backups /mnt/backups cifs uid=1000,credentials=/home/akanealw/.smbcreds,iocharset=utf8,vers=2.1,noperm,noauto,x-systemd.automount 0 0" >> /etc/fstab
-    echo "//192.168.1.41/storage /mnt/storage cifs uid=1000,credentials=/home/akanealw/.smbcreds,iocharset=utf8,vers=2.1,noperm,noauto,x-systemd.automount 0 0" >> /etc/fstab
-    mount /mnt/backups -v
-    mount /mnt/storage -v
+    echo "//192.168.1.41/data /mnt/data cifs _netdev,x-systemd.automount,uid=1000,gid=1000,credentials=/home/akanealw/.smbcreds,iocharset=utf8 0 0" >> /etc/fstab
 fi
 
 # ask to install samba