diff --git a/README.md b/README.md
index b029ef1411..cf8acd6d19 100644
--- a/README.md
+++ b/README.md
@@ -159,6 +159,7 @@ In addition to being able to host netboot.xyz locally, you can also create your
 | OpenBSD | https://openbsd.org | Yes | No |
 | openEuler | https://openeuler.org | Yes | No |
 | OpenSUSE | https://opensuse.org | Yes | No |
+| OPSI	 | https://download.uib.de | Yes | No |
 | Oracle Linux | https://www.oracle.com/linux/ | Yes | Installer |
 | Parrot Security | https://www.parrotsec.org | No | Yes |
 | Peppermint | https://peppermintos.com | No | Yes |
diff --git a/endpoints.yml b/endpoints.yml
index 96003ca2d3..c4ba275fe1 100644
--- a/endpoints.yml
+++ b/endpoints.yml
@@ -434,6 +434,13 @@ endpoints:
     - squashfs.img
     os: oracle
     version: '7'
+  OPSI:
+    path: /asset-mirror/releases/download/20220330-7a5741de/
+    files:
+    - vmlinuz-x64
+    - miniroot-x64.zstd
+    os: opsi
+    version: current
   kodachi-6:
     path: /ubuntu-squash/releases/download/6.2-2a23039c/
     files:
diff --git a/roles/netbootxyz/templates/menu/opsi.ipxe.j2 b/roles/netbootxyz/templates/menu/opsi.ipxe.j2
new file mode 100644
index 0000000000..6e8afbf9b1
--- /dev/null
+++ b/roles/netbootxyz/templates/menu/opsi.ipxe.j2
@@ -0,0 +1,41 @@
+#!ipxe
+
+goto ${menu} ||
+
+:opsi_menu
+menu OPSI {{ endpoints.opsi.version }} (Open PC Server Integration)
+set kernel_url ${live_endpoint}{{ endpoints.opsi.path }}vmlinuz-x64
+item --gap THIS SOFTWARE DESTROYS DATA
+item --gap EVERY BOOT OPTION IS DESTRUCTIVE
+item --gap DO NOT PROCEED IF YOU DO NOT KNOW WHAT THIS IS
+item opsi_exit ${space} Go Back
+item opsi_options ${space} Proceed I know what I am doing
+choose menu || goto opsi_exit
+goto ${menu}
+
+:opsi_options
+clear menu
+menu OPSI {{ endpoints.opsi.version }} (Open PC Server Integration)
+item --gap Choose a method:
+item boot=lang=en video=vesa:ywrap,mtrr vga=791 service --- ${space} Start opsi (english)
+item boot=lang=en video=vesa:ywrap,mtrr vga=791 service nodhcp --- ${space} Start opsi without DHCP (english)
+item boot=lang=de video=vesa:ywrap,mtrr vga=791 service --- ${space} Opsi starten (deutsch)
+item boot=lang=de video=vesa:ywrap,mtrr vga=791 service nodhcp --- ${space} Opsi ohne DHCP starten (deutsch)
+item boot=lang=fr video=vesa:ywrap,mtrr vga=791 service --- ${space} Start opsi (french)
+item boot=lang=fr video=vesa:ywrap,mtrr vga=791 service nodhcp --- ${space} Start opsi without DHCP (french)
+item boot=lang=it video=vesa:ywrap,mtrr vga=791 service --- ${space} Start opsi (italian)
+item boot=lang=it video=vesa:ywrap,mtrr vga=791 service nodhcp --- ${space} Start opsi without DHCP (italian)
+item boot=lang=da video=vesa:ywrap,mtrr vga=791 service --- ${space} Start opsi (danish)
+item boot=lang=da video=vesa:ywrap,mtrr vga=791 service nodhcp --- ${space} Start opsi without DHCP (danish)
+choose opsi_method || goto dban_exit
+goto opsi_boot
+
+:opsi_boot
+imgfree
+kernel ${kernel_url} ${opsi_method} ${cmdline}
+initrd ${live_endpoint}{{ endpoints.opsi.path }}miniroot-x64.zstd
+boot
+
+:opsi_exit
+clear menu
+exit 0