diff --git a/roles/fai/defaults/main.yml b/roles/fai/defaults/main.yml
index 1af900c..f62419e 100644
--- a/roles/fai/defaults/main.yml
+++ b/roles/fai/defaults/main.yml
@@ -32,6 +32,7 @@ fai_squashfs_file: "squash.img"
 fai_squashfs_path: "{{ fai_dir_download + '/' + fai_squashfs_file }}"
 #fai_loguser: "fai"
 fai_menu_default: 'HW4F Desktop Jammy'
+fai_nfsroot_force_rebuild: false
 
 fai_hw4f_rootpw_fai: "fai"
 fai_hw4f_profile_username: "user"
diff --git a/roles/fai/handlers/main.yml b/roles/fai/handlers/main.yml
index 818d72a..d0e4153 100644
--- a/roles/fai/handlers/main.yml
+++ b/roles/fai/handlers/main.yml
@@ -70,3 +70,8 @@
     name: unbound
     state: reloaded
   listen: reload unbound
+
+- name: "Force rebuild nfsroot"
+  ansible.builtin.set_fact:
+    fai_nfsroot_force_rebuild: true
+
diff --git a/roles/fai/tasks/fai-etc-dir.yml b/roles/fai/tasks/fai-etc-dir.yml
index 306bdee..0639d7f 100644
--- a/roles/fai/tasks/fai-etc-dir.yml
+++ b/roles/fai/tasks/fai-etc-dir.yml
@@ -7,6 +7,8 @@
     mode: '0644'
     owner: root
     group: root
+  notify:
+    - Force rebuild nfsroot
   tags:
     - fai_conf
 
@@ -25,6 +27,8 @@
     group: root
   when:
     - debian_release_fai == debian_release_nfsroot
+  notify:
+    - Force rebuild nfsroot
   tags:
     - fai_nfsroot_sources_list
 
@@ -40,6 +44,8 @@
   loop: "{{ paths }}"
   when:
     - debian_release_fai == debian_release_nfsroot
+  notify:
+    - Force rebuild nfsroot
 
 - name: "Set repositories for nfsroot in '{{ dest }}'"
   become: true
@@ -54,6 +60,8 @@
     group: root
   when:
     - debian_release_fai != debian_release_nfsroot
+  notify:
+    - Force rebuild nfsroot
   tags:
     - fai_nfsroot_sources_list
 
@@ -68,6 +76,8 @@
   loop:
     - "{{ fai_etc_dir }}/apt"
     - "{{ fai_etc_dir }}/apt/preferences.d"
+  notify:
+    - Force rebuild nfsroot
 
 - name: "Set apt preferences for nfsroot in '{{ dest }}'"
   become: true
@@ -79,6 +89,8 @@
     owner: root
     group: root
     mode: "0644"
+  notify:
+    - Force rebuild nfsroot
   tags:
     - fai_nfsroot_apt_preferences
 
@@ -94,6 +106,12 @@
     group: root
   tags:
     - fai_nfsroot_apt_preferences
+  notify:
+    - Force rebuild nfsroot
   when:
     - falsen
+  notify:
+    - Force rebuild nfsroot
+  notify:
+    - Force rebuild nfsroot
 
diff --git a/roles/fai/tasks/fai-nfsroot.yml b/roles/fai/tasks/fai-nfsroot.yml
index 3866470..dad9134 100644
--- a/roles/fai/tasks/fai-nfsroot.yml
+++ b/roles/fai/tasks/fai-nfsroot.yml
@@ -1,21 +1,11 @@
 ---
-- name: "Create configuration for nfsroot"
+- name: "Delete nfsroot '{{ fai_dir_nfsroot }}' to force rebuilt"
   become: true
-  ansible.builtin.template:
-    src: "etc/fai/nfsroot.conf.j2"
-    dest: "{{ fai_etc_dir }}/nfsroot.conf"
-    owner: root
-    group: root
-    mode: '0644'
-
-- name: "Create package_config for nfsroot"
-  become: true
-  ansible.builtin.template:
-    src: "etc/fai/NFSROOT.j2"
-    dest: "{{ fai_etc_dir }}/NFSROOT"
-    owner: root
-    group: root
-    mode: '0644'
+  ansible.builtin.file:
+    path: "{{ fai_dir_nfsroot }}"
+    state: absent
+  when:
+    - fai_nfsroot_force_rebuild
 
 - name: "Test if nfsroot dir '{{ fai_dir_nfsroot }}' already exists"
   become: true
@@ -45,7 +35,7 @@
     - "FOCAL64"
     - "JAMMY64"
   tags:
-    - unbound_configure
+    - basefiles
 
 - name: "Allow '{{ fai_loguser }}' to write to '{{ tftp_dir }}' to ship logs"
   become: true