diff --git a/debian.sh b/debian.sh
index e3cacc5..cd8ff46 100755
--- a/debian.sh
+++ b/debian.sh
@@ -34,7 +34,8 @@ BTRFS="/dev/$(lsblk | grep $HARD_DISK | head -4 | tail -1 | cut -c 7-20 | cut -d
 BOOT="/dev/$(lsblk | grep $HARD_DISK | head -3 | tail -1 | cut -c 7-20 | cut -d ' ' -f1)"
 ROOT_NAME='debian'
 ROOT_MAPPER_NAME='root'
-BACKUP_DISK='/dev/disk/by-uuid/43076025-fa41-4b02-9c69-d0193a1a0371'
+BACKUP_DISK='/dev/disk/by-uuid/c4c696f9-08f4-43db-a3e2-8cee7862ca0a'
+BACKUP_DISK_MAPPER='usbdebian'
 ######################################
 USER="verita84"
 USER_PASSWORD="123456"
@@ -69,8 +70,8 @@ create-os-snapshots() {
     echo
     echo "[Creating new snapshots.....]"
     echo
-    mkdir -p $TARGET/\@install/var/lib/backup
-    time tar cvpzf $TARGET/\@install/var/lib/backup/$1.tgz --exclude=/volumes/* --exclude=/mnt/* --exclude=/var/tmp/* --exclude=/tmp/* --exclude=/raid/* --exclude=/root/* --exclude=/var/cache/apt/archives/* --exclude=/proc/* --exclude=/.snapshots/* --exclude=$TARGET/* --exclude=/var/lib/libvirt/* --exclude=/dev/* --exclude=/sys/* --exclude=/home/* --exclude=/var/lib/postgresql --exclude=/var/lib/containers /
+    mkdir -p $TARGET/\@$BACKUP_DISK_MAPPER/var/lib/backup
+    time tar cvpzf $TARGET/\@$BACKUP_DISK_MAPPER/var/lib/backup/$1.tgz --exclude=/volumes/* --exclude=/mnt/* --exclude=/var/tmp/* --exclude=/tmp/* --exclude=/raid/* --exclude=/root/* --exclude=/var/cache/apt/archives/* --exclude=/proc/* --exclude=/.snapshots/* --exclude=$TARGET/* --exclude=/var/lib/libvirt/* --exclude=/dev/* --exclude=/sys/* --exclude=/home/* --exclude=/var/lib/postgresql --exclude=/var/lib/containers /
 }
 
 homeBackup() {
@@ -82,20 +83,38 @@ homeBackup() {
 
 os-backup() {
     umount $TARGET
+    printf "$DISK_PASSWORD" | cryptsetup open $BACKUP_DISK $BACKUP_DISK_MAPPER
+    if [[ -e "/dev/mapper/$BACKUP_DISK_MAPPER" ]]; then
+        echo
+        echo "[Mounting.....]"
+        echo
+        mount /dev/mapper/$BACKUP_DISK_MAPPER $TARGET
+       
+        if [[ -e "$TARGET/@$BACKUP_DISK_MAPPER/usr/bin/bash" ]]; then
+            if [ "$2" = "home" ]; then
+                homeBackup
+            fi
 
-    echo
-    echo "[Mounting.....]"
-    echo
-    printf "$DISK_PASSWORD" | cryptsetup open $BACKUP_DISK install
-    mount /dev/mapper/install $TARGET
+            create-os-snapshots "$1"
+        else
+            echo
+            echo "Aborting Install, $TARGET/@$BACKUP_DISK_MAPPER/usr/bin/bash not found!"
+            echo
+            echo
+            exit 1
+        fi
 
-    if [ "$2" = "home" ]; then
-        homeBackup
+    else
+        echo
+        echo "Aborting Install, /dev/mapper/$BACKUP_DISK_MAPPER not found!"
+        echo
+        echo
+        exit 1
     fi
 
-    create-os-snapshots "$1"
     ls $TARGET/
     umount $TARGET
+    cryptsetup close $BACKUP_DISK_MAPPER
 }
 
 os-restore() {
@@ -341,6 +360,7 @@ unmount() {
     umount -R $TARGET/*
     umount -R $TARGET
     umount -R $TARGET
+    cryptsetup close $ROOT_MAPPER_NAME
 }
 
 locale() {