diff --git a/matter-base/main.sh b/matter-base/main.sh
index ad2313e..9a0837c 100644
--- a/matter-base/main.sh
+++ b/matter-base/main.sh
@@ -68,7 +68,7 @@ fi
 
 info "Creating directory structure"
 pushd $TARGET > /dev/null
-  mkdir -p {dev,proc,sys,run,tmp,root,home,boot}
+  mkdir -p {dev,proc,sys,run,tmp,root,home,boot,mnt}
   mkdir -p var/{log,mail,lib}
   mkdir -p usr/{bin,lib,sbin}
   mkdir -p etc/mp
@@ -184,6 +184,8 @@ cat > $TARGET/etc/shells << "EOF"
 /bin/bash 
 EOF
 
+cp "$TARGET/etc/skel/."* "$TARGET/root"
+
 info "Installing certs"
 wget -q https://hg.mozilla.org/projects/nss/raw-file/tip/lib/ckfw/builtins/certdata.txt -O "$TARGET/certdata.txt"
 matter-chroot $TARGET make-ca > /dev/null 
diff --git a/matter-chroot/main.sh b/matter-chroot/main.sh
index 0a9f13a..ab5c628 100644
--- a/matter-chroot/main.sh
+++ b/matter-chroot/main.sh
@@ -104,5 +104,5 @@ if [ $# -gt 1 ]; then
   exit $RET_CODE
 fi
 
-chrt bash --login
+chrt bash --noprofile --login
 exit $?