diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
index 46166be3dc..04fc21a553 100644
--- a/.github/workflows/pull-requests.yml
+++ b/.github/workflows/pull-requests.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install ansible==9.0.1 ansible-lint==6.22.1
+        pip install ansible==10.2.0 ansible-lint==24.7.0
 
     - name: Syntax Check
       run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc933c18cf..e5bae8709d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,20 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [2.0.80] - 2024-00-00
+## [2.0.81] - 2024-08-10
+
+## Added
+
+- Added ZFSBootMenu
+- Added VanillaOS
+- Added Super Grub2 Disk for EFI
+
+### Fixed
+
+- Slowness with Ubuntu 24.04 net install getting stuck on Cloud Init
+- Removed hard coded console on VyOS to fix on Equinix Metal
+
+## [2.0.80] - 2024-07-17
 
 ### Added
 
diff --git a/README.md b/README.md
index c8d0e7347c..e2f8c9720a 100644
--- a/README.md
+++ b/README.md
@@ -181,6 +181,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | Ubuntu | https://www.ubuntu.com | Yes | Yes |
 | VMware | https://www.vmware.com | User supplied media | No |
 | VMware Photon | https://vmware.github.io/photon/ | Yes | No |
+| Vanilla OS | https://vanillaos.org | No | Yes |
 | Voyager | https://voyagerlive.org | No | Yes |
 | VyOS | https://vyos.io | Yes | No |
 | Zen Installer | https://sourceforge.net/projects/revenge-installer | Yes | No |
@@ -208,6 +209,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | Super Grub2 Disk | https://www.supergrubdisk.org | ISO - Memdisk |
 | System Rescue | https://system-rescue.org/ | LiveCD |
 | Ultimate Boot CD | https://www.ultimatebootcd.com | ISO - Memdisk |
+| ZFSBootMenu | https://docs.zfsbootmenu.org/ | Kernel |
 
 ### Stargazers over time
 
diff --git a/endpoints.yml b/endpoints.yml
index 86e3e49c76..21141ffe1c 100644
--- a/endpoints.yml
+++ b/endpoints.yml
@@ -81,13 +81,13 @@ endpoints:
     flavor: xfce
     kernel: kali-xfce-squash
   kde-neon-user:
-    path: /ubuntu-squash/releases/download/20240704-0716-9b372e2a/
+    path: /ubuntu-squash/releases/download/20240801-0717-9b372e2a/
     files:
     - vmlinuz
     - filesystem.squashfs
     - initrd.lz
     os: neon
-    version: 20240704-0716
+    version: 20240801-0717
     flavor: user
     kernel: kde-neon-user
   regolith-current:
@@ -413,7 +413,7 @@ endpoints:
     version: current
     flavor: full
   4mlinux-thesss:
-    path: /asset-mirror/releases/download/45.0-4aab1393/
+    path: /asset-mirror/releases/download/46.0-4aab1393/
     files:
     - initrd
     - vmlinuz
@@ -421,7 +421,7 @@ endpoints:
     version: current
     flavor: TheSSS
   4mlinux-bakandimg:
-    path: /asset-mirror/releases/download/45.0-d0598ee4/
+    path: /asset-mirror/releases/download/46.0-d0598ee4/
     files:
     - initrd
     - vmlinuz
@@ -429,7 +429,7 @@ endpoints:
     version: current
     flavor: BakAndImg
   4mlinux-antivirus:
-    path: /asset-mirror/releases/download/45.0-1.3.0-43b0f75b/
+    path: /asset-mirror/releases/download/46.0-1.3.1-43b0f75b/
     files:
     - initrd
     - vmlinuz
@@ -552,7 +552,7 @@ endpoints:
     version: 5.8
     kernel: linux-lite-5-squash
   vyos-rolling:
-    path: /debian-squash/releases/download/1.5-rolling-202407100021-0956eeaa/
+    path: /debian-squash/releases/download/1.5-rolling-202408090021-0956eeaa/
     files:
     - filesystem.squashfs
     - initrd
@@ -621,13 +621,13 @@ endpoints:
     os: redorescue
     version: 4.0.0
   mint-lmde-cinnamon-squash:
-    path: /debian-squash/releases/download/6-dc29210f/
+    path: /debian-squash/releases/download/6-1834227b/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: mint
-    version: lmde
+    version: '6'
     flavor: Cinnamon
     kernel: mint-lmde-cinnamon-squash
   mint-20-mate-squash:
@@ -757,22 +757,22 @@ endpoints:
     os: memtest86-free
     version: '11.0'
   gentoo-x86:
-    path: /asset-mirror/releases/download/20240614T220409Z-5b773f72/
+    path: /asset-mirror/releases/download/20240701T164854Z-5b773f72/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20240614T220409Z
+    version: 20240701T164854Z
     arch: x86
   gentoo-arm64:
-    path: /asset-mirror/releases/download/20240630T230404Z-d5972d15/
+    path: /asset-mirror/releases/download/20240714T234904Z-d5972d15/
     files:
     - image.squashfs
     - initrd
     - vmlinuz
     os: gentoo
-    version: 20240630T230404Z
+    version: 20240714T234904Z
     arch: arm64
   gentoo-amd64:
     path: /asset-mirror/releases/download/20240317T170433Z-63d6ec39/
@@ -784,14 +784,15 @@ endpoints:
     version: 20240317T170433Z
     arch: amd64
   tails:
-    path: /asset-mirror/releases/download/6.4-cfd50f75/
+    path: /asset-mirror/releases/download/6.5-cfd50f75/
     files:
     - vmlinuz
     - initrd.img
     - 9990-misc-helpers.sh
     - tails-amd64-6.4.iso
+    - tails-amd64-6.5.iso
     os: tails
-    version: '6.4'
+    version: '6.5'
     arch: amd64
   hrmpf:
     path: /asset-mirror/releases/download/20231124-1008bb6d/
@@ -849,11 +850,11 @@ endpoints:
     version: 0.34_32-bit_20221231
     arch: i686
   shredos-x86_64:
-    path: /asset-mirror/releases/download/2023.08.2_25.0_x86-64_0.35-91d6cdbd/
+    path: /asset-mirror/releases/download/2024.02.2_26.0_x86-64_0.37-bd59ed1f/
     files:
     - shredos
     os: shredos
-    version: 2023.08.2_25.0_x86-64_0.35
+    version: 2024.02.2_26.0_x86-64_0.37
     arch: x86_64
   archlinux-32:
     path: /asset-mirror/releases/download/2023.03.02-f7a7f796/
@@ -865,68 +866,68 @@ endpoints:
     version: 2023.03.02
     arch: i686
   clonezilla-debian-stable-i686:
-    path: /debian-squash/releases/download/3.1.3-11-ef1ff756/
+    path: /debian-squash/releases/download/3.1.3-16-ef1ff756/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.1.3-11
+    version: 3.1.3-16
     flavor: stable
     kernel: clonezilla-debian-stable-i686
     arch: i686
   clonezilla-debian-stable-amd64:
-    path: /debian-squash/releases/download/3.1.3-11-5641363c/
+    path: /debian-squash/releases/download/3.1.3-16-5641363c/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.1.3-11
+    version: 3.1.3-16
     flavor: stable
     kernel: clonezilla-debian-stable-amd64
     arch: amd64
   clonezilla-ubuntu-stable-amd64:
-    path: /ubuntu-squash/releases/download/20240630-noble-48403403/
+    path: /ubuntu-squash/releases/download/20240715-noble-48403403/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 20240630-noble
+    version: 20240715-noble
     flavor: stable
     kernel: clonezilla-ubuntu-stable-amd64
     arch: amd64
   clonezilla-debian-testing-amd64:
-    path: /debian-squash/releases/download/3.1.3-10-9e73bfe5/
+    path: /debian-squash/releases/download/3.1.3-19-9e73bfe5/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.1.3-10
+    version: 3.1.3-19
     flavor: testing
     kernel: clonezilla-debian-testing-amd64
     arch: amd64
   clonezilla-debian-testing-i686:
-    path: /debian-squash/releases/download/3.1.3-10-d1702a7a/
+    path: /debian-squash/releases/download/3.1.3-19-d1702a7a/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 3.1.3-10
+    version: 3.1.3-19
     flavor: testing
     kernel: clonezilla-debian-testing-i686
     arch: i686
   clonezilla-ubuntu-testing-amd64:
-    path: /ubuntu-squash/releases/download/20240630-oracular-c67d897c/
+    path: /ubuntu-squash/releases/download/20240806-oracular-c67d897c/
     files:
     - filesystem.squashfs
     - initrd
     - vmlinuz
     os: clonezilla
-    version: 20240630-oracular
+    version: 20240806-oracular
     flavor: testing
     kernel: clonezilla-ubuntu-testing-amd64
     arch: amd64
@@ -1255,33 +1256,33 @@ endpoints:
     version: 6.4
     kernel: linux-lite-6-squash
   mint-21-cinnamon-squash:
-    path: /ubuntu-squash/releases/download/21.3-54642d82/
+    path: /ubuntu-squash/releases/download/21-1ff19e78/
     files:
     - initrd
     - vmlinuz
     - filesystem.squashfs
     os: mint
-    version: '21.3'
+    version: '21'
     flavor: Cinnamon
     kernel: mint-21-cinnamon-squash
   mint-21-mate-squash:
-    path: /ubuntu-squash/releases/download/21.3-ebae47d8/
+    path: /ubuntu-squash/releases/download/21-b57bf769/
     files:
     - initrd
     - vmlinuz
     - filesystem.squashfs
     os: mint
-    version: '21.3'
+    version: '21'
     flavor: mate
     kernel: mint-21-mate-squash
   mint-21-xfce-squash:
-    path: /ubuntu-squash/releases/download/21.3-08410bb1/
+    path: /ubuntu-squash/releases/download/21-41ed8540/
     files:
     - initrd
     - vmlinuz
     - filesystem.squashfs
     os: mint
-    version: '21.3'
+    version: '21'
     flavor: xfce
     kernel: mint-21-xfce-squash
   oracle-9-x86_64:
@@ -1361,87 +1362,6 @@ endpoints:
     version: '20.04'
     flavor: LXQT
     kernel: ubuntu-20.04-LXQT-squash
-  fedora-38-gnome:
-    path: /fedora-assets/releases/download/1.6-cf0a667b/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 38
-    flavor: GNOME
-  fedora-38-Cinnamon:
-    path: /fedora-assets/releases/download/1.6-777dc12b/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 38
-    flavor: Cinnamon
-  fedora-38-LXDE:
-    path: /fedora-assets/releases/download/1.6-a20bfa52/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 38
-    flavor: LXDE
-  fedora-38-KDE:
-    path: /fedora-assets/releases/download/1.6-cb69598e/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 38
-    flavor: KDE
-  fedora-38-LXQt:
-    path: /fedora-assets/releases/download/1.6-65a81f68/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 38
-    flavor: LXQt
-  fedora-38-MATE_Compiz:
-    path: /fedora-assets/releases/download/1.6-7e8150df/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 38
-    flavor: MATE_Compiz
-  fedora-38-SoaS:
-    path: /fedora-assets/releases/download/1.6-508d8fd6/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 38
-    flavor: SoaS
-  fedora-38-i3:
-    path: /fedora-assets/releases/download/1.6-11d75d21/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 38
-    flavor: i3
-  fedora-38-Xfce:
-    path: /fedora-assets/releases/download/1.6-56ddbe0b/
-    files:
-    - vmlinuz
-    - initrd
-    - squashfs.img
-    os: fedora
-    version: 38
-    flavor: Xfce
   debian-12-live-kernel:
     path: /debian-core-12/releases/download/12.6.0-e814dabe/
     files:
@@ -1513,28 +1433,6 @@ endpoints:
     version: '12'
     flavor: kde
     kernel: debian-12-live-kernel
-  ubuntu-netboot-23.10-arm64:
-    path: /ubuntu-squash/releases/download/23.10-8b679ff7/
-    files:
-    - initrd
-    - vmlinuz
-    os: ubuntu
-    version: '23.10'
-    codename: mantic
-    flavor: netboot
-    kernel: ubuntu-netboot-23.10-arm64
-    arch: arm64
-  ubuntu-netboot-23.10-amd64:
-    path: /ubuntu-squash/releases/download/23.10-5b615fc9/
-    files:
-    - initrd
-    - vmlinuz
-    os: ubuntu
-    version: '23.10'
-    codename: mantic
-    flavor: netboot
-    kernel: ubuntu-netboot-23.10-amd64
-    arch: amd64
   fedora-39-gnome:
     path: /fedora-assets/releases/download/1.5-0ccbf396/
     files:
@@ -1739,3 +1637,53 @@ endpoints:
     version: '24.04'
     flavor: GNOME
     kernel: ubuntu-24.04-default-squash
+  vanilla-os:
+    path: /asset-mirror/releases/download/20240728-32e3ebb7/
+    files:
+    - initrd
+    - filesystem.squashfs
+    - vmlinuz
+    os: vanilla-os
+    version: 2-20240728
+  zfsbootmenu:
+    path: /asset-mirror/releases/download/2.3.0-43c730d4/
+    files:
+    - zfsbootmenu-recovery-x86_64.efi
+    os: zfsbootmenu
+    version: 2.3.0
+  supergrubdisk:
+    path: /asset-mirror/releases/download/2.06s4-0e736968/
+    files:
+    - supergrub2-classic-x86_64.efi
+    os: supergrubdisk
+    version: 2.06s4
+  mint-22-xfce-squash:
+    path: /ubuntu-squash/releases/download/22-42f238bf/
+    files:
+    - initrd
+    - vmlinuz
+    - filesystem.squashfs
+    os: mint
+    version: '22'
+    flavor: xfce
+    kernel: mint-22-xfce-squash
+  mint-22-cinnamon-squash:
+    path: /ubuntu-squash/releases/download/22-1431f755/
+    files:
+    - initrd
+    - vmlinuz
+    - filesystem.squashfs
+    os: mint
+    version: '22'
+    flavor: Cinnamon
+    kernel: mint-22-cinnamon-squash
+  mint-22-mate-squash:
+    path: /ubuntu-squash/releases/download/22-979f0303/
+    files:
+    - initrd
+    - vmlinuz
+    - filesystem.squashfs
+    os: mint
+    version: '22'
+    flavor: mate
+    kernel: mint-22-mate-squash
diff --git a/roles/netbootxyz/defaults/main.yml b/roles/netbootxyz/defaults/main.yml
index 2ab5c73bc4..08c5935765 100644
--- a/roles/netbootxyz/defaults/main.yml
+++ b/roles/netbootxyz/defaults/main.yml
@@ -158,8 +158,8 @@ releases:
     mirror: mirrors.kernel.org
     name: Arch Linux
     versions:
-    - code_name: 2024.06.01
-      name: 2024.06.01
+    - code_name: 2024.08.01
+      name: 2024.08.01
   blackarch:
     enabled: true
     menu: linux
@@ -189,11 +189,11 @@ releases:
     mirror: https://builds.coreos.fedoraproject.org
     name: Fedora CoreOS
     versions:
-    - code_name: 40.20240602.3.0
+    - code_name: 40.20240709.3.1
       name: stable
-    - code_name: 40.20240616.2.0
+    - code_name: 40.20240728.2.1
       name: testing
-    - code_name: 40.20240616.1.0
+    - code_name: 40.20240728.1.1
       name: next
   debian:
     archive_mirror: http://archive.debian.org
@@ -289,8 +289,8 @@ releases:
     mirror: https://downloads.ipfire.org
     name: IPFire
     versions:
-    - code_name: 2.29-core186
-      name: 2.29 Core186
+    - code_name: 2.29-core187
+      name: 2.29 Core187
   k3os:
     enabled: true
     menu: linux
@@ -443,14 +443,14 @@ releases:
     mirror: https://netboot.smartos.org/os/
     name: SmartOS
     versions:
-    - code_name: 20240613T000428Z
-      name: 20240613T000428Z
-    - code_name: 20240530T000454Z
-      name: 20240530T000454Z
-    - code_name: 20240516T000925Z
-      name: 20240516T000925Z
-    - code_name: 20240502T000615Z
-      name: 20240502T000615Z
+    - code_name: 20240808T000421Z
+      name: 20240808T000421Z
+    - code_name: 20240726T084648Z
+      name: 20240726T084648Z
+    - code_name: 20240725T192004Z
+      name: 20240725T192004Z
+    - code_name: 20240711T031348Z
+      name: 20240711T031348Z
   talos:
     enabled: true
     menu: linux
@@ -601,8 +601,6 @@ releases:
     versions:
     - code_name: noble
       name: 24.04 LTS Noble Numbat
-    - code_name: mantic
-      name: 23.10 Mantic Minotaur
     - code_name: jammy
       name: 22.04 LTS Jammy Jellyfish
     - code_name: focal
@@ -710,10 +708,20 @@ utilitiesefi:
     enabled: true
     name: ShredOS
     type: ipxemenu
+  supergrubdisk:
+    enabled: true
+    kernel: ${live_endpoint}{{ endpoints.supergrubdisk.path }}supergrub2-classic-x86_64.efi
+    name: Super Grub2 Disk
+    type: direct
   systemrescue:
     enabled: true
     name: System Rescue CD
     type: ipxemenu
+  zfsbootmenu:
+    enabled: true
+    kernel: ${live_endpoint}{{ endpoints.zfsbootmenu.path }}zfsbootmenu-recovery-x86_64.efi
+    name: ZFSBootMenu
+    type: direct
 utilitiespcbios32:
   clonezilla:
     enabled: true
@@ -825,7 +833,7 @@ utilitiespcbios64:
     type: ipxemenu
   supergrub:
     enabled: true
-    name: SuperGRUB
+    name: Super GRUB2 Disk
     type: memdisk
     util_path: http://master.dl.sourceforge.net/project/supergrub2/2.04s1/super_grub2_disk_2.04s1/super_grub2_disk_hybrid_2.04s1.iso
     version: 2.04s1
diff --git a/roles/netbootxyz/tasks/generate_disks_base.yml b/roles/netbootxyz/tasks/generate_disks_base.yml
index b70698b0a3..946b45e5d5 100644
--- a/roles/netbootxyz/tasks/generate_disks_base.yml
+++ b/roles/netbootxyz/tasks/generate_disks_base.yml
@@ -13,7 +13,7 @@
     - "{{ ansible_os_family | lower }}.yml"
 
 - name: Ensure EPEL is enabled
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: epel-release
     state: present
   when:
@@ -31,7 +31,7 @@
     - "{{ netbootxyz_root }}/ipxe"
     - "{{ cert_dir }}"
 
-- name: Retreive latest wimboot
+- name: Retrieve latest wimboot
   ansible.builtin.get_url:
     url: "{{ wimboot_upstream_url }}"
     dest: "{{ netbootxyz_root }}/wimboot"
diff --git a/roles/netbootxyz/templates/menu/live-mint.ipxe.j2 b/roles/netbootxyz/templates/menu/live-mint.ipxe.j2
index 45d8e392fe..e2313893f1 100644
--- a/roles/netbootxyz/templates/menu/live-mint.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/live-mint.ipxe.j2
@@ -8,32 +8,31 @@ menu ${os}
 item --gap ${os} Versions
 item 21 ${space} ${os} 21
 item 20 ${space} ${os} 20
-item 19 ${space} ${os} 19
 item lmde ${space} ${os} LMDE
 choose live_version || goto live_exit
 menu ${os} ${live_version}
 item --gap ${os} Flavors
 goto ${live_version}
 
-:21
+:22
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "mint" and 'squash' in key and '21' in value.version %}
+{% if value.os == "mint" and 'squash' in key and '22' in value.version %}
 item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
 {% endif %}
 {% endfor %}
 goto flavor_select
 
-:20
+:21
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "mint" and 'squash' in key and '20' in value.version %}
+{% if value.os == "mint" and 'squash' in key and '21' in value.version %}
 item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
 {% endif %}
 {% endfor %}
 goto flavor_select
 
-:19
+:20
 {% for key, value in endpoints.items() | sort %}
-{% if value.os == "mint" and 'squash' in key and '19' in value.version %}
+{% if value.os == "mint" and 'squash' in key and '20' in value.version %}
 item {{ key }} ${space} {{ value.os | title }} {{ value.version }} {{ value.flavor | title}}
 {% endif %}
 {% endfor %}
@@ -70,21 +69,21 @@ goto {{ value.version | int }}-boot
 {% endif %}
 {% endfor %}
 
-:21-boot
+:22-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
-:20-boot
+:21-boot
 imgfree
 kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
-:19-boot
+:20-boot
 imgfree
-kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=http fetch=${squash_url} {{ kernel_params }}
+kernel ${kernel_url}vmlinuz ip=dhcp boot=casper netboot=url url=${squash_url} {{ kernel_params }}
 initrd ${kernel_url}initrd
 boot
 
diff --git a/roles/netbootxyz/templates/menu/live-vanillaos.ipxe b/roles/netbootxyz/templates/menu/live-vanillaos.ipxe
new file mode 100644
index 0000000000..03d1817a71
--- /dev/null
+++ b/roles/netbootxyz/templates/menu/live-vanillaos.ipxe
@@ -0,0 +1,33 @@
+#!ipxe
+
+goto ${menu} ||
+
+:live_menu
+set os Vanilla OS
+menu ${os}
+item --gap ${os} Versions
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "vanilla-os" %}
+item vanilla_{{ value.version }} ${space} ${os} {{ value.version }}
+{% endif %}
+{% endfor %}
+choose live_version || goto live_exit
+goto ${live_version}
+
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "vanilla-os" %}
+:vanilla_{{ value.version }}
+set kernel_url ${live_endpoint}{{ value.path }}
+goto boot
+{% endif %}
+{% endfor %}
+
+:boot
+imgfree
+kernel ${kernel_url}vmlinuz boot=live fetch=${kernel_url}/filesystem.squashfs config username=vanilla user-fullname=Vanilla quiet splash bgrt_disable modprobe.blacklist=nouveau initrd=initrd.magic ${cmdline}
+initrd ${kernel_url}initrd
+boot
+
+:live_exit
+clear menu
+exit 0
diff --git a/roles/netbootxyz/templates/menu/live.ipxe.j2 b/roles/netbootxyz/templates/menu/live.ipxe.j2
index 235f0d8ad2..34c94ced49 100644
--- a/roles/netbootxyz/templates/menu/live.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/live.ipxe.j2
@@ -38,6 +38,7 @@ item live-sparky ${space} SparkyLinux
 item live-tails ${space} Tails
 item tinycore ${space} Tiny Core Linux
 item live-ubuntu ${space} Ubuntu
+item live-vanillaos ${space} Vanilla OS
 item live-voyager ${space} Voyager
 item live-zorin ${space} Zorin OS
 choose menu || goto live_exit
diff --git a/roles/netbootxyz/templates/menu/menu.ipxe.j2 b/roles/netbootxyz/templates/menu/menu.ipxe.j2
index 98d98f00ed..5f3110ddf8 100644
--- a/roles/netbootxyz/templates/menu/menu.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/menu.ipxe.j2
@@ -98,7 +98,7 @@ chain ${menu}.ipxe || goto error
 goto main_menu
 
 :error
-echo Error occured, press any key to return to menu ...
+echo Error occurred, press any key to return to menu ...
 prompt
 goto main_menu
 
diff --git a/roles/netbootxyz/templates/menu/systemrescue.ipxe.j2 b/roles/netbootxyz/templates/menu/systemrescue.ipxe.j2
index a46bf620d3..a401e4a72d 100644
--- a/roles/netbootxyz/templates/menu/systemrescue.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/systemrescue.ipxe.j2
@@ -17,7 +17,7 @@ item --gap ${os} Versions
 iseq ${os_arch} {{ value.arch }} && item {{ value.version }}_${os_arch} ${space} ${os} {{ value.version }} ||
 {% endif %}
 {% endfor %}
-item rootpass_mac Enable rootpass=${rootpass} [ enabled: ${rootpass_enabled} ]
+item rootpass_mac Enable rootpass=${rootpass} [IP:${ip}] [ enabled: ${rootpass_enabled} ]
 choose live_version || goto live_exit
 goto ${live_version}
 
@@ -32,7 +32,7 @@ goto boot
 
 :rootpass_mac
 clear params
-iseq ${rootpass_enabled} true && set rootpass_enabled false || set rootpass_enabled true && set params rootpass=${rootpass}
+iseq ${rootpass_enabled} true && set rootpass_enabled false || set rootpass_enabled true && set params rootpass=${rootpass} nofirewall
 goto live_menu
 
 :boot
diff --git a/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2 b/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2
index a4fa24a62f..d17bcb3874 100644
--- a/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/ubuntu.ipxe.j2
@@ -110,7 +110,7 @@ iseq ${os_arch} amd64 && set ubuntu_iso_url http://releases.ubuntu.com/${codenam
 iseq ${os_arch} arm64 && set ubuntu_iso_url http://cdimage.ubuntu.com/releases/${version_number}/release/ubuntu-${version_number}-live-server-${os_arch}.iso ||
 isset ${dhcp-server} && set netboot_params ip=dhcp url=${ubuntu_iso_url} || set netboot_params
 echo Loading Ubuntu Subiquity Network Installer...
-kernel ${kernel_url}vmlinuz root=/dev/ram0 ramdisk_size=1500000 ${netboot_params} ${install_params} {{ kernel_params }}
+kernel ${kernel_url}vmlinuz root=/dev/ram0 ramdisk_size=3500000 cloud-config-url=/dev/null ${netboot_params} ${install_params} {{ kernel_params }}
 initrd ${kernel_url}initrd
 echo
 echo MD5sums:
diff --git a/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2 b/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2
index 0e6faa9bb1..5d26971a3c 100644
--- a/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/utils-efi.ipxe.j2
@@ -24,7 +24,9 @@ goto utils_exit
 :{{ key }}
 imgfree
 kernel {{ value.kernel }}
+{% if value.initrd is defined and value.initrd %}
 initrd {{ value.initrd }}
+{% endif %}
 boot
 goto utils_exit
 {% endif %}
diff --git a/roles/netbootxyz/templates/menu/vyos.ipxe.j2 b/roles/netbootxyz/templates/menu/vyos.ipxe.j2
index d764e26bf5..09748169eb 100644
--- a/roles/netbootxyz/templates/menu/vyos.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/vyos.ipxe.j2
@@ -18,7 +18,7 @@ goto vyos_boot
 :vyos_boot
 imgfree
 set url ${live_endpoint}{{ endpoints['vyos-rolling'].path }}
-kernel ${url}vmlinuz boot=live components hostname=vyos username=live nopersistence noautologin union=overlay console=ttyS0,115200 console=tty0 net.ifnames=0 biosdevname=0 fetch=${url}filesystem.squashfs {{ kernel_params }}
+kernel ${url}vmlinuz boot=live components hostname=vyos username=live nopersistence noautologin union=overlay console=tty0 net.ifnames=0 biosdevname=0 fetch=${url}filesystem.squashfs {{ kernel_params }}
 initrd ${url}initrd
 
 boot
diff --git a/version.txt b/version.txt
index 1c8a624837..633d31e43b 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.0.80
+2.0.81