diff --git a/README.md b/README.md
index c8d0e734..e86d885f 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 |
diff --git a/roles/netbootxyz/templates/menu/live-vanillaos.ipxe b/roles/netbootxyz/templates/menu/live-vanillaos.ipxe
new file mode 100644
index 00000000..823ce79e
--- /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.img
+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 235f0d8a..34c94ced 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