diff --git a/setup.sh b/setup.sh
index 9bc990b..3fc188f 100644
--- a/setup.sh
+++ b/setup.sh
@@ -569,8 +569,25 @@ function main () {
     else
         set_ntp
         update_pacman_db
+
         install_pkgs 'jq'
+        local zfs_part
         zfs_part="$(select_part 'zfs')"
+
+        install_zfs
+        setup_zpool "${zfs_part}"
+        mount_system
+        copy_zpool_cache
+        install_archlinux
+        gen_fstab
+        set_hostname
+        set_locale
+        add_zfs_hook_to_initramfs
+        set_initramfs_build_list
+        add_zfs_files_to_new_os
+        enter_chroot
+        # We're done in chroot
+        finalize_os_setup
     fi
 }