diff --git a/docs/Getting Started/Arch Linux/Root on ZFS/3-system-configuration.rst b/docs/Getting Started/Arch Linux/Root on ZFS/3-system-configuration.rst
index f29392f..1b90f36 100644
--- a/docs/Getting Started/Arch Linux/Root on ZFS/3-system-configuration.rst	
+++ b/docs/Getting Started/Arch Linux/Root on ZFS/3-system-configuration.rst	
@@ -111,6 +111,7 @@ System Configuration
     INST_ID=$INST_ID
     INST_VDEV=$INST_VDEV
     DISK=\"$DISK\"" > /mnt/root/chroot
+    history -w /mnt/home/sys-install-pre-chroot.txt
     arch-chroot /mnt bash --login
 
 #. Source variables::
diff --git a/docs/Getting Started/Fedora/Root on ZFS/1-preparation.rst b/docs/Getting Started/Fedora/Root on ZFS/1-preparation.rst
index 6066c56..6ca0d73 100644
--- a/docs/Getting Started/Fedora/Root on ZFS/1-preparation.rst	
+++ b/docs/Getting Started/Fedora/Root on ZFS/1-preparation.rst	
@@ -7,11 +7,11 @@ Preparation
    :local:
 
 #. Disable Secure Boot. ZFS modules can not be loaded if Secure Boot is enabled.
-#. Download a variant of Fedora 35 live image
+#. Download a variant of Fedora 36 live image
    and boot from it.
 
-   - `Fedora Workstation (GNOME) <https://download.fedoraproject.org/pub/fedora/linux/releases/35/Workstation/x86_64/iso/>`__
-   - `Fedora Spins (Xfce, i3, ...) <https://download.fedoraproject.org/pub/fedora/linux/releases/35/Spins/x86_64/iso/>`__
+   - `Fedora Workstation (GNOME) <https://download.fedoraproject.org/pub/fedora/linux/releases/36/Workstation/x86_64/iso/>`__
+   - `Fedora Spins (Xfce, i3, ...) <https://download.fedoraproject.org/pub/fedora/linux/releases/36/Spins/x86_64/iso/>`__
 
 #. Set root password or ``/root/.ssh/authorized_keys``.
 #. Start SSH server::
@@ -56,7 +56,7 @@ Preparation
 
 #. Target Fedora version::
 
-    INST_FEDORA_VER='35'
+    INST_FEDORA_VER=${VERSION_ID}
 
 #. Unique pool suffix. ZFS expects pool names to be
    unique, therefore it's recommended to create
diff --git a/docs/Getting Started/Fedora/Root on ZFS/3-system-configuration.rst b/docs/Getting Started/Fedora/Root on ZFS/3-system-configuration.rst
index d24f7a7..5b49a69 100644
--- a/docs/Getting Started/Fedora/Root on ZFS/3-system-configuration.rst	
+++ b/docs/Getting Started/Fedora/Root on ZFS/3-system-configuration.rst	
@@ -91,6 +91,8 @@ System Configuration
     unalias -a
     INST_VDEV=$INST_VDEV
     DISK=\"$DISK\"" > /mnt/root/chroot
+    #backup bash inputs up to this point
+    history -w /mnt/home/sys-install-pre-chroot.txt
     arch-chroot /mnt bash --login
 
 #. Source variables::
diff --git a/docs/Getting Started/NixOS/Root on ZFS/4-system-installation.rst b/docs/Getting Started/NixOS/Root on ZFS/4-system-installation.rst
index 0c4052b..268c6cc 100644
--- a/docs/Getting Started/NixOS/Root on ZFS/4-system-installation.rst	
+++ b/docs/Getting Started/NixOS/Root on ZFS/4-system-installation.rst	
@@ -62,6 +62,10 @@ System installation
     zfs snapshot -r rpool_$INST_UUID/$INST_ID@install_start
     zfs snapshot -r bpool_$INST_UUID/$INST_ID@install_start
 
+#. Back up bash inputs::
+
+    history -w /mnt/home/sys-install-pre-chroot.txt
+
 #. Apply configuration
 
    If root password hash is not set::
diff --git a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/1-preparation.rst b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/1-preparation.rst
index ff3e255..a5b4f12 100644
--- a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/1-preparation.rst	
+++ b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/1-preparation.rst	
@@ -53,12 +53,12 @@ Preparation
 
 #. Install helper script and partition tool::
 
-    rpm -ivh --nodeps https://dl.fedoraproject.org/pub/fedora/linux/releases/35/Everything/x86_64/os/Packages/a/arch-install-scripts-24-2.fc35.noarch.rpm
+    rpm -ivh --nodeps https://dl.fedoraproject.org/pub/fedora/linux/releases/36/Everything/x86_64/os/Packages/a/arch-install-scripts-24-3.fc36.noarch.rpm
     dnf install -y gdisk dosfstools
 
-#. Set RHEL version::
+#. Set RHEL major version::
 
-    INST_RHEL_VER=8
+    INST_RHEL_VER=${VERSION_ID%%.*}
 
 #. Unique pool suffix. ZFS expects pool names to be
    unique, therefore it's recommended to create
diff --git a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/3-system-configuration.rst b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/3-system-configuration.rst
index c281f49..d9848e2 100644
--- a/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/3-system-configuration.rst	
+++ b/docs/Getting Started/RHEL-based distro/RHEL 8-based distro Root on ZFS/3-system-configuration.rst	
@@ -87,6 +87,7 @@ System Configuration
     INST_VDEV=$INST_VDEV
     INST_VDEV=$INST_VDEV
     DISK=\"$DISK\"" > /mnt/root/chroot
+    history -w /mnt/home/sys-install-pre-chroot.txt
     arch-chroot /mnt bash --login
 
 #. Source variables::