diff --git a/roles/network/defaults/main.yml b/roles/network/defaults/main.yml
index d405a43c9..a354fd7ac 100644
--- a/roles/network/defaults/main.yml
+++ b/roles/network/defaults/main.yml
@@ -52,6 +52,6 @@ dhcpd_install: True
 dhcpd_enabled: True
 named_install: True
 named_enabled: True
-dnsmasq_install: True
 dnsmasq_enabled: False
+dnsmasq_install: False
 captive_portal_enabled: False
diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml
index 4a950fecc..e15d8ab0a 100644
--- a/roles/network/tasks/enable_services.yml
+++ b/roles/network/tasks/enable_services.yml
@@ -66,7 +66,7 @@
 - name: Create xs_httpcache flag
   shell: echo 1 > /etc/sysconfig/xs_httpcache_on
          creates=/etc/sysconfig/xs_httpcache_on
-  when: squid_enabled
+  when: squid_enabled and squid_install
 
 - name: Enable Squid service
   service: name={{ proxy }}
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 4304f37b7..5a82d6d55 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -103,11 +103,19 @@
 - include: computed_services.yml
   tags:
     - network
+    - named
+    - dhcpd
+    - dnsmasq
+    - squid
 
 # templates needed from above install section live here
 - include: enable_services.yml
   tags:
     - network
+    - named
+    - dhcpd
+    - dnsmasq
+    - squid
 
 - include: hostapd.yml
   tags:
@@ -140,4 +148,8 @@
   when: not installing
   tags:
     - network
+    - named
+    - dhcpd
+    - dnsmasq
+    - squid
 #### end services