diff --git a/debian.sh b/debian.sh
index e88d852..cc62003 100755
--- a/debian.sh
+++ b/debian.sh
@@ -109,7 +109,7 @@ create-os-snapshots() {
 	echo "[Creating new OS snapshot to $2/$3.tgz]"
 	echo
 	echo
-	NEW_TAR_EXCLUDES="$TAR_EXCLUDES --exclude=/minio --exclude=$TARGET/*"
+	NEW_TAR_EXCLUDES="$TAR_EXCLUDES --exclude=/minio --exclude=$TARGET/* --exclude=/var/lib/docker "
 	echo
 	time tar cpzf $2/$3.tgz $NEW_TAR_EXCLUDES /
 	chown $USER:$USER $2/$3.tgz
@@ -618,8 +618,8 @@ accounts() {
 	echo "Setting ROOT Password:"
 	echo "root:$ROOT_PASSWORD" | chpasswd
 	/usr/bin/hostnamectl set-hostname $ROOT_NAME
-	echo "/bin/zsh" | chsh $USER
-	echo "/bin/zsh" | chsh $root
+	echo "$USER_PASSWORD" | chsh -s /usr/bin/zsh $USER
+	echo "$ROOT_PASSWORD" | chsh -s /usr/bin/zsh root
 }
 
 btrfs-tweaks() {