diff --git a/templates/boot.ipxe.j2 b/templates/boot.ipxe.j2
index a59bbe8..2b086fa 100644
--- a/templates/boot.ipxe.j2
+++ b/templates/boot.ipxe.j2
@@ -25,7 +25,6 @@
 item --key f deb10f       Debian 10 Installer (nonfree firmware)
 {% endif %}
 {% if "debian11" in pxeboot_boot_images %}
-item --key g deb11        Debian 11 Installer
 item --key h deb11f       Debian 11 Installer (nonfree firmware)
 item --key h deb11afs     Debian 11 Installer (nonfree firmware, auto, serial)
 item --key h deb11afm     Debian 11 Installer (nonfree firmware, auto, MAC)
@@ -34,7 +33,6 @@
 item --key u ub1804       Ubuntu 18.04 Installer
 item --key a ub1804as     Ubuntu 18.04 Installer (fully automatic, serial)
 item --key m ub1804am     Ubuntu 18.04 Installer (fully automatic, MAC)
-item --key t ub1804adt    Ubuntu 18.04 Installer (fully automatic, debug, text)
 {% endif %}
 {% if "ubuntu2004" in pxeboot_boot_images %}
 item --key v ub2004       Ubuntu 20.04 Installer
@@ -95,46 +93,22 @@
 {% endif %}
 
 # installers
-{% if "debian10" in pxeboot_boot_images %}
-
-# Debian 10
-:deb10
-echo Booting Debian 10 Installer
-kernel ${http_server_url}/debian10/linux initrd=initrd.gz
-initrd ${http_server_url}/debian10/initrd.gz initrd.gz
-boot || goto failed
-
-# Debian 10 with nonfree firmware
-:deb10f
-echo Booting Debian 10 Installer with nonfree firmware
-kernel ${http_server_url}/debian10/linux initrd=initrd.gz initrd=firmware.cpio.gz
-initrd ${http_server_url}/debian10/initrd.gz initrd.gz
-initrd ${http_server_url}/debian10/firmware.cpio.gz firmware.cpio.gz
-boot || goto failed
-{% endif %}
 {% if "debian11" in pxeboot_boot_images %}
 
-# Debian 11
-:deb11
-echo Booting Debian 11 Installer
-kernel ${http_server_url}/debian11/linux initrd=initrd.gz
-initrd ${http_server_url}/debian11/initrd.gz
-boot || goto failed
-
 # Debian 11 with nonfree firmware
 :deb11f
 echo Booting Debian 11 Installer with nonfree firmware
 kernel ${http_server_url}/debian11/linux initrd=initrd.gz initrd=firmware.cpio.gz
-initrd ${http_server_url}/debian11/initrd.gz initrd.gz
-initrd ${http_server_url}/debian11/firmware.cpio.gz firmware.cpio.gz
+initrd ${http_server_url}/debian11/initrd.gz
+initrd ${http_server_url}/debian11/firmware.cpio.gz
 boot || goto failed
 
 # Debian 11 with nonfree firmware, auto, serial
 :deb11afs
 echo Booting Debian 11 Installer with nonfree firmware, auto, serial
 kernel ${http_server_url}/debian11/linux initrd=initrd.gz initrd=firmware.cpio.gz initrd=preseed.cfg
-initrd ${http_server_url}/debian11/initrd.gz initrd.gz
-initrd ${http_server_url}/debian11/firmware.cpio.gz firmware.cpio.gz
+initrd ${http_server_url}/debian11/initrd.gz
+initrd ${http_server_url}/debian11/firmware.cpio.gz
 initrd ${http_server_url}/debian11/${serial}_preseed.cfg preseed.cfg
 boot || goto failed
 
@@ -142,8 +116,8 @@
 :deb11afm
 echo Booting Debian 11 Installer with nonfree firmware, auto, MAC
 kernel ${http_server_url}/debian11/linux initrd=initrd.gz initrd=firmware.cpio.gz initrd=preseed.cfg
-initrd ${http_server_url}/debian11/initrd.gz initrd.gz
-initrd ${http_server_url}/debian11/firmware.cpio.gz firmware.cpio.gz
+initrd ${http_server_url}/debian11/initrd.gz
+initrd ${http_server_url}/debian11/firmware.cpio.gz
 initrd ${http_server_url}/debian11/${net0/mac}_preseed.cfg preseed.cfg
 boot || goto failed
 {% endif %}
@@ -161,7 +135,7 @@
 :ub1804as
 echo Booting Ubuntu 18.04 Installer (autoinstall, serial)
 kernel ${http_server_url}/ubuntu1804/linux initrd=initrd.gz initrd=preseed.cfg
-initrd ${http_server_url}/ubuntu1804/initrd.gz initrd.gz
+initrd ${http_server_url}/ubuntu1804/initrd.gz
 initrd ${http_server_url}/ubuntu1804/${serial}_preseed.cfg preseed.cfg
 boot || goto failed
 
@@ -170,7 +144,7 @@
 :ub1804am
 echo Booting Ubuntu 18.04 Installer (autoinstall, MAC)
 kernel ${http_server_url}/ubuntu1804/linux initrd=initrd.gz initrd=preseed.cfg
-initrd ${http_server_url}/ubuntu1804/initrd.gz initrd.gz
+initrd ${http_server_url}/ubuntu1804/initrd.gz
 initrd ${http_server_url}/ubuntu1804/${net0/mac}_preseed.cfg preseed.cfg
 boot || goto failed
 {% if pxeboot_image_debug %}
@@ -179,18 +153,18 @@
 :ub1804adt
 echo Booting Ubuntu 18.04 Installer, text mode, debug
 kernel ${http_server_url}/ubuntu1804/linux initrd=initrd.gz initrd=preseed.cfg DEBIAN_FRONTEND=text BOOT_DEBUG=2
-initrd ${http_server_url}/ubuntu1804/initrd.gz initrd.gz
+initrd ${http_server_url}/ubuntu1804/initrd.gz
 initrd ${http_server_url}/ubuntu1804/${serial}_preseed.cfg preseed.cfg
 boot || goto failed
 {% endif %}
 {% endif %}
 {% if "ubuntu2004" in pxeboot_boot_images %}
 
-# Ubuntu 18.04
+# Ubuntu 20.04
 :ub2004
 echo Booting Ubuntu 20.04 Installer
 kernel ${http_server_url}/ubuntu2004/linux initrd=initrd.gz
-initrd ${http_server_url}/ubuntu2004/initrd.gz initrd.gz
+initrd ${http_server_url}/ubuntu2004/initrd.gz
 boot || goto failed
 {% endif %}
 {% if "openbsd70" in pxeboot_boot_images %}