diff --git a/roles/fai/tasks/fai-configure.yml b/roles/fai/tasks/fai-configure.yml
index 5a11259..306bdee 100644
--- a/roles/fai/tasks/fai-configure.yml
+++ b/roles/fai/tasks/fai-configure.yml
@@ -11,6 +11,36 @@
     - fai_conf
 
 ### "/etc/fai/apt" GETS COPIED TO NFSROOT BY "fai-make-nfsroot"
+- name: "Copy hosts '{{ src }}' to nfsroot"
+  become: true
+  vars:
+    src: "/etc/apt/sources.list.d"
+    dest: "/etc/fai/apt/sources.list.d"
+  ansible.builtin.copy:
+    remote_src: true
+    recursive: true
+    src: "{{ src }}"
+    dest: "{{ dest }}"
+    owner: root
+    group: root
+  when:
+    - debian_release_fai == debian_release_nfsroot
+  tags:
+    - fai_nfsroot_sources_list
+
+- name: "Remove 'sources.list' from nfsroot"
+  become: true
+  vars:
+    paths:
+      - "/etc/fai/apt/sources.list"
+      - "/etc/fai/apt/sources.list~"
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: absent
+  loop: "{{ paths }}"
+  when:
+    - debian_release_fai == debian_release_nfsroot
+
 - name: "Set repositories for nfsroot in '{{ dest }}'"
   become: true
   vars:
@@ -22,6 +52,8 @@
     mode: '0644'
     owner: root
     group: root
+  when:
+    - debian_release_fai != debian_release_nfsroot
   tags:
     - fai_nfsroot_sources_list
 
@@ -61,5 +93,7 @@
     owner: root
     group: root
   tags:
-    - fai_nfsroot_sources_preferences
+    - fai_nfsroot_apt_preferences
+  when:
+    - falsen