diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 6d00bc585..4a1db623f 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -15,6 +15,8 @@
             src=network/hostname.j2
             owner=root
             mode=0644
+  when: is_debuntu
+  register: hostname_change
   tags:
     - network
     - domain
@@ -25,6 +27,8 @@
             owner=root
             group=root
             mode=0644
+  when: is_redhat
+  register: hostname_change
   tags:
     - network
     - domain
@@ -35,7 +39,6 @@
             mode=0644
   with_items:
     - iiab_domain_name
-  register: domainname
   tags:
     - network
     - domain
@@ -48,17 +51,20 @@
 - include: hosts.yml
   tags:
     - network
+    - domain
 
 ##### end hostname setup
 ##### start install portion
 # only needs to be done once
 - include: installing.yml
+  when: hostname_change.changed or installing
   tags:
     - network
     - named
     - dhcpd
     - dnsmasq
     - squid
+    - domain
 
 - include: avahi.yml
   tags: