diff --git a/roles/2-common/tasks/hostname.yml b/roles/2-common/tasks/hostname.yml
index ab56a3182..ca72699c9 100644
--- a/roles/2-common/tasks/hostname.yml
+++ b/roles/2-common/tasks/hostname.yml
@@ -1,3 +1,7 @@
+- name: Creat filesytem layout
+  include_tasks: roles/2-common/tasks/fl.yml
+  when: first_run
+
 - name: turn the crank for systemd
   shell: hostnamectl set-hostname "{{ iiab_hostname }}.{{ iiab_domain }}"
   when: is_debuntu
diff --git a/roles/2-common/tasks/main.yml b/roles/2-common/tasks/main.yml
index 0e09e2514..06dacacbe 100644
--- a/roles/2-common/tasks/main.yml
+++ b/roles/2-common/tasks/main.yml
@@ -6,7 +6,7 @@
 #- include_tasks: iiab_ini.yml
 
 # create the directory structure for IIAB
-- include_tasks: fl.yml
+#- include_tasks: fl.yml
 
 - include_tasks: xo.yml
   when: xo_model != "none" or osbuilder is defined