diff --git a/roles/etcHosts/defaults/main.yml b/roles/etcHosts/defaults/main.yml
index 334c4ece796f451b799376626c31ebfbb35e5d2d..c85dccd9b9bf2e97a679142e46fd5cf218b9f9be 100644
--- a/roles/etcHosts/defaults/main.yml
+++ b/roles/etcHosts/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 domain: testdomain.massive.org.au
-create_facts: true
+get_groups: true
+edit_hosts: true
diff --git a/roles/etcHosts/tasks/main.yml b/roles/etcHosts/tasks/main.yml
index 637cca9a6d97471e90d7253d0ba75c4e038c31b2..ce9aacc257a048c485966f65cbbd5fd783c35143 100644
--- a/roles/etcHosts/tasks/main.yml
+++ b/roles/etcHosts/tasks/main.yml
@@ -2,13 +2,14 @@
   template: dest=/tmp/groups src=groups.j2
   run_once: True
   delegate_to: 127.0.0.1
-  when: create_facts
+  when: get_groups
 
 - name: make hosts data
   command: ./scripts/makehosts.py /tmp/groups {{ domain }}
   delegate_to: 127.0.0.1
   run_once: True
   register: hosts_data
+  when: edit_hosts
                
 - name: write hosts file
   lineinfile:
@@ -18,3 +19,5 @@
     state: present
   sudo: true
   with_items: hosts_data.stdout_lines
+  when: edit_hosts
+