diff --git a/README.md b/README.md
index f914899..d96b4c3 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,9 @@ macOS Mojave: 10.14.6 (18G103)
     - HowTo: <https://www.anyrecover.com/hard-drive-recovery-data/resize-partition-mac/> # Steps to Resize Mac Partition
   - Boot Fedora Installer from USB drive directly from macOS boot manager. (You can boot into it by pressing and holding Option key (ALT key) after clicking the power-on button when your computer was turned off or on restart/reboot when Apple logo is shown on the screen).
     - There will be two/three boot options available, usually the last one works for me. (There are multiple boot options, because there are three different partitions in the ISO to make the ISO bootable on different set of computers: 1) ISO9660: with installer data, 2) fat32, 3) hfs+)
-  - I recommend using standard partition layout during partitioning your Disk in anaconda (Fedora Installer) as I haven't tested other scenarios yet. <https://github.com/mikeeq/mbp-fedora/issues/2>
+  - I recommend using standard partition layout during partitioning your Disk in Anaconda (Fedora Installer) as I haven't tested other scenarios yet. <https://github.com/mikeeq/mbp-fedora/issues/2
+
+    - please create a separate partition for Linux EFI (Linux HFS+ ESP) as Anaconda installer requires separate partition on Mac devices and it'll be reformated to EFI (FAT32) during post-install scripts Anaconda's step (at the end of installation process).
 
     ```bash
       /boot/efi - 1024MB Linux HFS+ ESP
@@ -75,6 +77,8 @@ macOS Mojave: 10.14.6 (18G103)
       / - xxxGB EXT4
     ```
 
+    ![anaconda partitioning](screenshots/anaconda-3.png)
+
   - There will be an error on `Installing bootloader...` step, click Yes - It's related to `efi=noruntime` kernel arg
 
     ![bootloader issue](screenshots/bootloader.png)
@@ -111,16 +115,16 @@ sudo -i
 
 # Upgrade kernel beforehand
 ## update_kernel_mbp has built-in selfupgrade function, so when it fails it's just due to script update - please rerun everything should be good on second run
-KERNEL_VERSION="5.17.1-f35" UPDATE_SCRIPT_BRANCH="v5.17-f35" update_kernel_mbp
+KERNEL_VERSION="5.17.6-f36" UPDATE_SCRIPT_BRANCH="v5.17-f36" update_kernel_mbp
 
 # Upgrade your OS
 dnf upgrade -y --refresh
 dnf install -y dnf-plugin-system-upgrade
 
 # Exclude official kernel from upgrade to not override mbp-fedora-kernel
-## If you're trying to upgrade older version of mbp-fedora to latest version, please repeat a process by upgrading only to one major release of Fedora, i.e.: Fedora 33 -> 34, 34 -> 35
+## If you're trying to upgrade older version of mbp-fedora to latest version, please repeat a process by upgrading only to one major release of Fedora, i.e.: Fedora 33 -> 34, 34 -> 35, 35 -> 36
 
-FEDORA_VERSION=35 dnf system-upgrade download -y --releasever=${FEDORA_VERSION} --exclude='kernel*'
+FEDORA_VERSION=36 dnf system-upgrade download -y --releasever=${FEDORA_VERSION} --exclude='kernel*'
 
 # Reboot your Mac
 dnf system-upgrade reboot
diff --git a/build.sh b/build.sh
index 1081089..a39af63 100755
--- a/build.sh
+++ b/build.sh
@@ -3,10 +3,10 @@
 set -eu -o pipefail
 
 CURRENT_PWD=$(pwd)
-FEDORA_VERSION=35
+FEDORA_VERSION=36
 FEDORA_KICKSTARTS_GIT_URL=https://pagure.io/fedora-kickstarts.git
-FEDORA_KICKSTARTS_BRANCH_NAME=f35
-FEDORA_KICKSTARTS_COMMIT_HASH=3cfe995016eebde3204dab81b30d9768aab0df17        # https://pagure.io/fedora-kickstarts/commits/f35
+FEDORA_KICKSTARTS_BRANCH_NAME=f36
+FEDORA_KICKSTARTS_COMMIT_HASH=a69afdb7e04c06cde624a9de2444d755e95ee8b4        # https://pagure.io/fedora-kickstarts/commits/f36
 LIVECD_TOOLS_GIT_URL=https://github.com/mikeeq/livecd-tools
 LIVECD_TOOLS_GIT_BRANCH_NAME=feature/fix-f35-build
 LIVECD_CACHE_PATH=/var/cache/live
diff --git a/fedora-mbp.ks b/fedora-mbp.ks
index 767a369..ee9d3b2 100644
--- a/fedora-mbp.ks
+++ b/fedora-mbp.ks
@@ -18,20 +18,20 @@ iwd
 wpa_supplicant
 -shim-ia32-15.4-*.x86_64
 -shim-x64-15.4-*.x86_64
--kernel-5.*.fc35.x86_64
--kernel-core-5.*.fc35.x86_64
--kernel-devel-5.*.fc35.x86_64
--kernel-devel-matched-5.*.fc35.x86_64
--kernel-modules-5.*.fc35.x86_64
--kernel-modules-extra-5.*.fc35.x86_64
--kernel-modules-internal-5.*.fc35.x86_64
-kernel-5.17.1-300.mbp.fc33.x86_64
-kernel-core-5.17.1-300.mbp.fc33.x86_64
-kernel-devel-5.17.1-300.mbp.fc33.x86_64
-kernel-devel-matched-5.17.1-300.mbp.fc33.x86_64
-kernel-modules-5.17.1-300.mbp.fc33.x86_64
-kernel-modules-extra-5.17.1-300.mbp.fc33.x86_64
-kernel-modules-internal-5.17.1-300.mbp.fc33.x86_64
+-kernel-5.*.fc36.x86_64
+-kernel-core-5.*.fc36.x86_64
+-kernel-devel-5.*.fc36.x86_64
+-kernel-devel-matched-5.*.fc36.x86_64
+-kernel-modules-5.*.fc36.x86_64
+-kernel-modules-extra-5.*.fc36.x86_64
+-kernel-modules-internal-5.*.fc36.x86_64
+kernel-5.17.6-300.mbp.fc33.x86_64
+kernel-core-5.17.6-300.mbp.fc33.x86_64
+kernel-devel-5.17.6-300.mbp.fc33.x86_64
+kernel-devel-matched-5.17.6-300.mbp.fc33.x86_64
+kernel-modules-5.17.6-300.mbp.fc33.x86_64
+kernel-modules-extra-5.17.6-300.mbp.fc33.x86_64
+kernel-modules-internal-5.17.6-300.mbp.fc33.x86_64
 
 %end
 
@@ -51,8 +51,8 @@ echo 'nameserver 8.8.8.8' > /etc/resolv.conf
 echo "===]> Info: Print /etc/resolv.conf"
 cat /etc/resolv.conf
 
-KERNEL_VERSION=5.17.1-300.mbp.fc33.x86_64
-UPDATE_SCRIPT_BRANCH=v5.17-f35
+KERNEL_VERSION=5.17.6-300.mbp.fc33.x86_64
+UPDATE_SCRIPT_BRANCH=v5.17-f36
 BCE_DRIVER_GIT_URL=https://github.com/t2linux/apple-bce-drv
 BCE_DRIVER_BRANCH_NAME=aur
 BCE_DRIVER_COMMIT_HASH=f93c6566f98b3c95677de8010f7445fa19f75091
diff --git a/screenshots/anaconda-1.png b/screenshots/anaconda-1.png
new file mode 100644
index 0000000..4f08cda
Binary files /dev/null and b/screenshots/anaconda-1.png differ
diff --git a/screenshots/anaconda-2.png b/screenshots/anaconda-2.png
new file mode 100644
index 0000000..18264ab
Binary files /dev/null and b/screenshots/anaconda-2.png differ
diff --git a/screenshots/anaconda-3.png b/screenshots/anaconda-3.png
new file mode 100644
index 0000000..760ea9b
Binary files /dev/null and b/screenshots/anaconda-3.png differ
diff --git a/screenshots/anaconda-4.png b/screenshots/anaconda-4.png
new file mode 100644
index 0000000..456f3f2
Binary files /dev/null and b/screenshots/anaconda-4.png differ