diff --git a/profile/airootfs/root/.zlogin b/profile/airootfs/root/.zlogin
index bb07fe3..2fbd798 100644
--- a/profile/airootfs/root/.zlogin
+++ b/profile/airootfs/root/.zlogin
@@ -5,12 +5,13 @@ fi
 
 loadkeys fr
 
-echo "[.zlogin] ____ starting auto install ____"
-archinstall --config ./user_configuration.json --creds ./user_credentials.json --silent
-echo "[.zlogin] ____ finished auto install ____"
-echo "[.zlogin] ____ starting post install ____"
-sh post_install.sh
-echo "[.zlogin] ____ finished post install ____"
-
-#     echo "[.zlogin] shutting down ..."
-#     # shutdown now
+(
+    set -e
+    echo "[.zlogin] ____ starting auto install ____"
+    archinstall --config ./user_configuration.json --creds ./user_credentials.json --silent
+    echo "[.zlogin] ____ finished auto install ____"
+    echo "[.zlogin] ____ starting post install ____"
+    sh post_install.sh
+    echo "[.zlogin] ____ finished post install ____"
+    shutdown now
+)
diff --git a/profile/airootfs/root/post_install.sh b/profile/airootfs/root/post_install.sh
index acc9460..0d24aa8 100644
--- a/profile/airootfs/root/post_install.sh
+++ b/profile/airootfs/root/post_install.sh
@@ -19,4 +19,4 @@ log "installing paru"
         git clone https://aur.archlinux.org/paru-bin.git
         cd paru-bin
         makepkg -si
-    " | arch-chroot "$ROOT" su user sh
+    " | arch-chroot "$ROOT" su user