diff --git a/defaults/main.yml b/defaults/main.yml
index 22f5d09..5ae36da 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,7 +4,10 @@ nebula_network_cidr: 24
 nebula_ca_cert_duration: "87600h0m0s" #10 years
 nebula_client_cert_duration: "43800h0m0s" #5 years
 nebula_clean_install: false
-nebula_install_check_cron: yes
+nebula_lighthouse_build_hosts_file: true
+nebula_node_lighthouse_in_hosts_file: true
+nebula_install_check_cron: true
+
 
 nebula_lighthouse_hostname: lighthouse
 nebula_lighthouse_internal_ip_addr: 192.168.77.1
diff --git a/tasks/node.yml b/tasks/node.yml
index 0e68107..e4ed33b 100644
--- a/tasks/node.yml
+++ b/tasks/node.yml
@@ -10,11 +10,13 @@
     path: /etc/hosts
     line: "{{ nebula_internal_ip_addr }} {{ inventory_hostname }}.neb"
   delegate_to: "{{ groups.nebula_lighthouse[0] }}"
+  when: nebula_lighthouse_build_hosts_file
 
 - name: Ensure node has hosts file entry for lighthouse
   lineinfile:
     path: /etc/hosts
     line: "{{ nebula_lighthouse_internal_ip_addr }} {{ nebula_lighthouse_hostname }}.neb"
+  when: nebula_node_lighthouse_in_hosts_file
 
 - name: Read cert/key from lighthouse
   slurp: