diff --git a/README.md b/README.md
index 7c5434cb..3d954978 100644
--- a/README.md
+++ b/README.md
@@ -127,14 +127,15 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | BlackArch Linux | https://blackarch.org | Yes | Yes |
 | Bluestar Linux | https://sourceforge.net/projects/bluestarlinux | No | Yes |
 | Bodhi Linux | https://www.bodhilinux.com | No | Yes |
+| CachyOS | https://cachyos.org | No | Yes |
 | CentOS | https://centos.org | Yes | No |
-| Fedora CoreOS | https://getfedora.org/en/coreos?stream=stable | Yes | No |
 | Debian | https://debian.org | Yes | Yes|
 | Devuan | https://devuan.org | Yes | No |
 | Elementary OS | https://elementary.io | No | Yes |
 | EndeavourOS | https://endeavouros.com | No | Yes |
 | Fatdog64 | https://distro.ibiblio.org/fatdog/web/ | No | Yes |
 | Fedora | https://fedoraproject.org | Yes | Yes |
+| Fedora CoreOS | https://getfedora.org/en/coreos?stream=stable | Yes | No |
 | Feren OS | https://ferenos.weebly.com/ | Yes | No |
 | Flatcar Container Linux | https://www.flatcar.org | Yes | No |
 | FreeBSD | https://freebsd.org | Yes, disk image | No |
diff --git a/roles/netbootxyz/templates/menu/live-cachyos.ipxe.j2 b/roles/netbootxyz/templates/menu/live-cachyos.ipxe.j2
new file mode 100644
index 00000000..41157354
--- /dev/null
+++ b/roles/netbootxyz/templates/menu/live-cachyos.ipxe.j2
@@ -0,0 +1,39 @@
+#!ipxe
+
+# CachyOS Operating System
+# https://cachyos.org
+
+goto ${menu} ||
+
+:live_menu
+set os CachyOS
+menu ${os}
+set ipparam BOOTIF=${netX/mac} ip=dhcp net.ifnames=0
+item --gap ${os} Versions
+{% for key, value in endpoints.items() | sort %}
+{% if value.os == "cachyos" %}
+item {{ 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 == "cachyos" %}
+:{{ value.version }}
+set url ${live_endpoint}{{ value.path }}
+goto boot
+
+{% endif %}
+{% endfor %}
+
+:boot
+imgfree
+kernel ${url}vmlinuz ${ipparam} archiso_http_srv=${url} cow_spacesize=10G copytoram=auto module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes initrd=initrd.magic console=tty1 {{ kernel_params }}
+initrd ${url}initrd
+initrd ${url}archiso_pxe_http /hooks/archiso_pxe_http mode=755
+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 a1457362..1922698a 100644
--- a/roles/netbootxyz/templates/menu/live.ipxe.j2
+++ b/roles/netbootxyz/templates/menu/live.ipxe.j2
@@ -8,6 +8,7 @@ item --gap Live Boot Distributions
 item live-backbox ${space} BackBox
 item live-bluestar ${space} Bluestar Linux
 item live-bodhi ${space} Bodhi
+item live-cachyos ${space} CachyOS
 item live-debian ${space} Debian
 item live-devuan ${space} Devuan
 item live-elementary ${space} elementary OS