diff --git a/roles/debianlive/tasks/main.yml b/roles/debianlive/tasks/main.yml
index 5cbe8e6..11a7f0a 100644
--- a/roles/debianlive/tasks/main.yml
+++ b/roles/debianlive/tasks/main.yml
@@ -15,6 +15,11 @@
   loop:
     "{{ live_images }}"
 
+- name: make sure loop module is loaded
+  modprobe:
+    name: loop
+    state: present
+
 - name: loop mount iso images
   mount:
     path: "/var/lib/tftpboot/d-i/n-live/{{ item.name }}"
@@ -24,19 +29,6 @@
     state: mounted
   loop:
     "{{ live_images }}"
-  when: not run_in_installer|default(false)|bool
-  notify: rebuild di-netboot menu
-
-- name: loop mount iso images after reboot
-  mount:
-    path: "/var/lib/tftpboot/d-i/n-live/{{ item.name }}"
-    src: "/var/cache/di-netboot-assistant/{{ item.iso }}"
-    fstype: iso9660
-    opts: loop,ro,nofail
-    state: present
-  loop:
-    "{{ live_images }}"
-  when: run_in_installer|default(false)|bool
   notify: rebuild di-netboot menu
 
 - name: prepare http downloads