diff --git a/roles/debianlive/tasks/main.yml b/roles/debianlive/tasks/main.yml
index 8b8708f..1def349 100644
--- a/roles/debianlive/tasks/main.yml
+++ b/roles/debianlive/tasks/main.yml
@@ -103,7 +103,7 @@
       :{{ item.item.key }}
           echo Booting Debian GNU/Linux {{ item.item.key }} NFS
           kernel ${210:string}d-i/n-live/{{ item.item.key }}/live/vmlinuz-{{ item.stdout }} \
-          initrd=initrd.img-5.10.0-13-amd64 {{ boot_params|join(' ') }} \
+          initrd=initrd.img-{{ item.stdout }} {{ boot_params|join(' ') }} \
           nfsroot={{ ansible_default_ipv4.address }}:/var/lib/tftpboot/d-i/n-live/{{ item.item.key }}/
           initrd ${210:string}d-i/n-live/{{ item.item.key }}/live/initrd.img-{{ item.stdout }}
           boot
diff --git a/roles/edulive/tasks/main.yml b/roles/edulive/tasks/main.yml
index b9dcecf..4ffb7c8 100644
--- a/roles/edulive/tasks/main.yml
+++ b/roles/edulive/tasks/main.yml
@@ -52,7 +52,7 @@
       :{{ item }}
           echo Booting Debian GNU/Linux EDU LIVE NFS
           kernel ${210:string}d-i/n-live/{{ item }}/live/vmlinuz \
-          initrd=initrd.img-5.10.0-13-amd64 {{ boot_params|join(' ') }} \
+          initrd=initrd.img {{ boot_params|join(' ') }} \
           nfsroot={{ ansible_default_ipv4.address }}:/var/lib/tftpboot/d-i/n-live/{{ item }}/
           initrd ${210:string}d-i/n-live/{{ item }}/live/initrd.img
           boot
diff --git a/roles/edulive/templates/main.yml b/roles/edulive/templates/main.yml
deleted file mode 100644
index cd5450e..0000000
--- a/roles/edulive/templates/main.yml
+++ /dev/null
@@ -1,54 +0,0 @@
----
-- name: install packages
-  apt:
-    name:
-      - live-build
-    state: latest # noqa package-latest
-
-- name: prepare live-build directory
-  file:
-    path: /opt/live-build/
-    state: directory
-    mode: 0755
-
-- name: copy build script
-  template:
-    src: livebuilder.sh
-    dest: /usr/local/sbin/
-    mode: 0755
-    
-- name: copy live-build configuration
-  copy:
-    src: gnome-edu
-    dest: /opt/live-build/
-    local_follow: false
-  notify: build image
-
-- name: prepare debian live boot loader ipxe
-  blockinfile:
-    path: /etc/di-netboot-assistant/ipxemenu.HEAD
-    marker: "# {mark} ANSIBLE MANAGED BLOCK gnome-edu"
-    block: |
-      :gnome-edu
-          echo Booting Debian GNU/Linux EDU LIVE
-          kernel ${210:string}d-i/n-live/gnome-edu/live/vmlinuz \
-          initrd=initrd.img-5.10.0-13-amd64 {{ boot_params|join(' ') }} \
-          nfsroot={{ ansible_default_ipv4.address }}:/var/lib/tftpboot/d-i/n-live/gnome-edu/
-          initrd ${210:string}d-i/n-live/gnome-edu/live/initrd.img
-          boot
-  notify: rebuild di-netboot menu
-
-- name: prepare debian live boot loader grub
-  blockinfile:
-    path: /etc/di-netboot-assistant/grub.cfg.HEAD
-    insertbefore: "^menuentry 'Boot from local disk..'"
-    marker: "# {mark} ANSIBLE MANAGED BLOCK gnome-edu"
-    block: |
-      menuentry 'Debian GNU/Linux Live gnome-edu' {
-          linux (http,{{ ansible_default_ipv4.address }})/d-i/n-live/gnome-edu/live/vmlinuz \
-          {{ boot_params|join(' ') }} \
-          nfsroot={{ ansible_default_ipv4.address }}:/var/lib/tftpboot/d-i/n-live/gnome-edu/
-          initrd (http,{{ ansible_default_ipv4.address }})/d-i/n-live/gnome-edu/live/initrd.img
-      }
-  notify: rebuild di-netboot menu
-