diff --git a/roles/network/tasks/hosts.yml b/roles/network/tasks/hosts.yml
index cf4b38278..0b3d55673 100644
--- a/roles/network/tasks/hosts.yml
+++ b/roles/network/tasks/hosts.yml
@@ -1,23 +1,25 @@
 #TODO: Use vars instead of hardcoded values
-- name: Remove fqdn in /etc/hosts without LAN
-  lineinfile: dest=/etc/hosts
-              regexp='^172\.18\.96\.1'
-              state=absent
+- name: Remove FQDN with 172.18.96.1 in /etc/hosts without LAN (if iiab_lan_iface == "none" and not installing)
+  lineinfile:
+    dest: /etc/hosts
+    regexp: '^172\.18\.96\.1'
+    state: absent
   when: iiab_lan_iface == "none" and not installing
 
-- name: Configure fqdn in /etc/hosts with LAN
-  lineinfile: dest=/etc/hosts
-              regexp='^172\.18\.96\.1'
-              line='172.18.96.1            {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box'
-              state=present
+- name: Configure FQDN with 172.18.96.1 in /etc/hosts with LAN (if iiab_lan_iface != "none" and not installing)
+  lineinfile:
+    dest: /etc/hosts
+    regexp: '^172\.18\.96\.1'
+    line: '172.18.96.1            {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box'
+    state: present
   when: iiab_lan_iface != "none" and not installing
 
-- name: Configure fqdn in /etc/hosts appliance mode
-  lineinfile: dest=/etc/hosts
-              regexp='^127\.0\.0\.1'
-              line='127.0.0.1            localhost.localdomain localhost {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box '
-              owner=root
-              group=root
-              mode=0644
+- name: Configure FQDN with 127.0.0.1 in /etc/hosts appliance mode (if iiab_lan_iface == "none" and not installing)
+  lineinfile:
+    dest: /etc/hosts
+    regexp: '^127\.0\.0\.1'
+    line: '127.0.0.1            localhost.localdomain localhost {{ iiab_hostname }}.{{ iiab_domain }} {{ iiab_hostname }} box '
+    owner: root
+    group: root
+    mode: 0644
   when: iiab_lan_iface == "none" and not installing
-