diff --git a/tasks/authorize_node.yml b/tasks/authorize_node.yml
index 62c7308..c48d0fb 100644
--- a/tasks/authorize_node.yml
+++ b/tasks/authorize_node.yml
@@ -2,7 +2,7 @@
 - block:
   - name: Authorize new members to network
     uri:
-      url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ ansible_local.zerotier.node_id }}"
+      url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ ansible_local['zerotier']['node_id'] }}"
       method: POST
       headers:
         Authorization: bearer {{ zerotier_api_accesstoken }}
@@ -14,11 +14,12 @@
       register: auth_apiresult
     delegate_to: "{{ zerotier_api_delegate }}"
     when:
-      - ansible_local.zerotier.networks[zerotier_network_id] is not defined or ansible_local.zerotier.networks[zerotier_network_id].status != 'OK'
+    - ansible_local['zerotier']['networks'][zerotier_network_id] is not defined or
+      ansible_local['zerotier']['networks'][zerotier_network_id]['status'] != 'OK'
 
   - name: Configure members in network
     uri:
-      url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ ansible_local.zerotier.node_id }}"
+      url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ ansible_local['zerotier']['node_id'] }}"
       method: POST
       headers:
         Authorization: bearer {{ zerotier_api_accesstoken }}
diff --git a/tasks/install.yml b/tasks/install.yml
index e7a9cf6..8d07188 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,6 +1,6 @@
 ---
 
-- include_tasks: install/{{ ansible_os_family }}.yml
+- include_tasks: install/{{ ansible_facts['os_family'] }}.yml
   tags:
   - installation
   - repositories
diff --git a/tasks/install/RedHat.yml b/tasks/install/RedHat.yml
index ed3a695..473b51e 100644
--- a/tasks/install/RedHat.yml
+++ b/tasks/install/RedHat.yml
@@ -11,7 +11,7 @@
     gpgcheck: yes
     enabled: yes
   register: zerotier_repo
-  when: ansible_distribution != "Fedora"
+  when: ansible_facts['distribution'] != "Fedora"
 
 - name: Add zerotier repo for Fedora
   yum_repository:
@@ -21,4 +21,4 @@
     gpgcheck: yes
     enabled: yes
   register: zerotier_repo
-  when: ansible_distribution == "Fedora"
+  when: ansible_facts['distribution'] == "Fedora"
diff --git a/tasks/main.yml b/tasks/main.yml
index 95fb317..29183f9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,20 +2,20 @@
 # tasks file for ansible-role-zerotier
 - import_tasks: install.yml
   when:
-  - not skip_install|default(false)|bool
+  - not skip_install | default(false) | bool
 
 - block:
   - name: Update ansible_local facts
     script: set_facts.sh
 
-  - name: Re-gather facts
-    setup: ~
+  - name: Re-gather ansible_local facts
+    setup: filter=ansible_local
 
 
 - import_tasks: authorize_node.yml
   when:
   - zerotier_api_accesstoken | length > 0
-  - ansible_local.zerotier.node_id is defined
+  - ansible_local['zerotier']['node_id'] is defined
 
 - import_tasks: join_network.yml
   when: