diff --git a/defaults/main.yml b/defaults/main.yml
index 41091524..6a7a11c1 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -25,7 +25,7 @@ ironic_venv_python_executable: "{{ openstack_venv_python_executable | default('p
 # for the service setup. The host must already have
 # clouds.yaml properly configured.
 ironic_service_setup_host: "{{ openstack_service_setup_host | default('localhost') }}"
-ironic_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((ironic_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
+ironic_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_python_interpreter | default((ironic_service_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
 
 # Comma separated list of Glance API servers
 ironic_glance_api_servers: "{{ (glance_service_internalurl | default('http://localhost')) | urlsplit('scheme') ~ '://' ~ (glance_service_internalurl | default('http://localhost')) | urlsplit('netloc') }}"
@@ -141,7 +141,7 @@ ironic_erase_devices_priority: 10
 
 # Database
 ironic_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
-ironic_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((ironic_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
+ironic_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((ironic_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
 ironic_galera_address: "{{ galera_address | default('127.0.0.1') }}"
 ironic_galera_user: ironic
 ironic_galera_database: ironic
@@ -246,7 +246,7 @@ ironic_service_user_name: "ironic"
 # WSGI settings
 ironic_wsgi_threads: 1
 ironic_wsgi_processes_max: 16
-ironic_wsgi_processes: "{{ [[(ansible_processor_vcpus//ansible_processor_threads_per_core)|default(1), 1] | max * 2, ironic_wsgi_processes_max] | min }}"
+ironic_wsgi_processes: "{{ [[(ansible_facts['processor_vcpus']//ansible_facts['processor_threads_per_core'])|default(1), 1] | max * 2, ironic_wsgi_processes_max] | min }}"
 ironic_uwsgi_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0') }}"
 
 ### OpenStack Services to integrate with
@@ -308,7 +308,7 @@ ironic_inspector_service_domain_id: default
 
 # Database
 ironic_inspector_db_setup_host: "{{ openstack_db_setup_host | default('localhost') }}"
-ironic_inspector_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((ironic_inspector_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_python['executable'])) }}"
+ironic_inspector_db_setup_python_interpreter: "{{ openstack_db_setup_python_interpreter | default((ironic_inspector_db_setup_host == 'localhost') | ternary(ansible_playbook_python, ansible_facts['python']['executable'])) }}"
 ironic_inspector_galera_address: "{{ galera_address | default('127.0.0.1') }}"
 ironic_inspector_galera_user: ironic-inspector
 ironic_inspector_galera_database: ironic_inspector
diff --git a/handlers/main.yml b/handlers/main.yml
index 5cbc75f2..4d9b7a57 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -48,7 +48,7 @@
     name: "nginx"
     enabled: yes
     state: restarted
-    daemon_reload: "{{ (ansible_service_mgr == 'systemd') | ternary('yes', omit) }}"
+    daemon_reload: yes
   register: _restart
   until: _restart is success
   retries: 5
diff --git a/meta/main.yml b/meta/main.yml
index 95f78faa..66c32473 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -37,4 +37,4 @@ galaxy_info:
 dependencies:
   - role: apt_package_pinning
     when:
-      - ansible_pkg_mgr == 'apt'
+      - ansible_facts['pkg_mgr'] == 'apt'
diff --git a/tasks/ironic_conductor_post_install.yml b/tasks/ironic_conductor_post_install.yml
index 7f8f937b..08f9441c 100644
--- a/tasks/ironic_conductor_post_install.yml
+++ b/tasks/ironic_conductor_post_install.yml
@@ -34,7 +34,7 @@
     src: "tftpd-hpa.j2"
     dest: "/etc/default/tftpd-hpa"
   when:
-    - ansible_os_family == 'Debian'
+    - ansible_facts['os_family'] == 'Debian'
   notify:
     - Restart tftpd
 
@@ -97,7 +97,7 @@
     path: "/etc/nginx/sites-enabled/ironic-ipxe.conf"
     state: link
   when:
-    - ansible_os_family == "Debian"
+    - ansible_facts['os_family'] == "Debian"
     - "ironic_ipxe_enabled | bool"
   notify:
     - Restart web server
diff --git a/tasks/ironic_inspector_post_install.yml b/tasks/ironic_inspector_post_install.yml
index c32bdcbe..d6c17c30 100644
--- a/tasks/ironic_inspector_post_install.yml
+++ b/tasks/ironic_inspector_post_install.yml
@@ -25,7 +25,7 @@
     path: /etc/default/dnsmasq
     state: present
     line: 'DNSMASQ_EXCEPT=lo'
-  when: ansible_os_family == 'Debian'
+  when: ansible_facts['os_family'] == 'Debian'
   notify:
     - Restart dnsmasq
 
@@ -36,7 +36,7 @@
     regexp: '^#IGNORE_RESOLVCONF=.*'
     line: 'IGNORE_RESOLVCONF=yes'
     backrefs: yes
-  when: ansible_os_family == 'Debian'
+  when: ansible_facts['os_family'] == 'Debian'
   notify:
     - Restart dnsmasq
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 8670d231..f2882d8f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -16,11 +16,11 @@
 - name: Gather variables for each operating system
   include_vars: "{{ item }}"
   with_first_found:
-    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
-    - "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
-    - "{{ ansible_distribution | lower }}.yml"
-    - "{{ ansible_os_family | lower }}.yml"
+    - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_version'] | lower }}.yml"
+    - "{{ ansible_facts['distribution'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
+    - "{{ ansible_facts['os_family'] | lower }}-{{ ansible_facts['distribution_major_version'] | lower }}.yml"
+    - "{{ ansible_facts['distribution'] | lower }}.yml"
+    - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always