diff --git a/tripleo_ansible/ansible_plugins/modules/container_puppet_config.py b/tripleo_ansible/ansible_plugins/modules/container_puppet_config.py
index 5d8d6ac66..e890fc9cb 100644
--- a/tripleo_ansible/ansible_plugins/modules/container_puppet_config.py
+++ b/tripleo_ansible/ansible_plugins/modules/container_puppet_config.py
@@ -107,7 +107,7 @@ EXAMPLES = """
   container_puppet_config:
     step: 1
     puppet-config: /var/lib/container-puppet/container-puppet.json
-    short_hostname: "{{ ansible_hostname }}"
+    short_hostname: "{{ ansible_facts['hostname'] }}"
     update_config_hash_only: false
 - name: Update config hashes for container startup configs
   container_puppet_config:
diff --git a/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/prepare.yml b/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/prepare.yml
index 447380bf6..44588de46 100644
--- a/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/prepare.yml
+++ b/tripleo_ansible/ansible_plugins/tests/molecule/podman_container/prepare.yml
@@ -37,4 +37,4 @@
 
           Testing with ansible {{ ansible_version.full }}
           with python {{ ansible_python_version }}
-          on host {{ ansible_distribution }} {{ ansible_distribution_version }}
+          on host {{ ansible_facts['distribution'] }} {{ ansible_facts['distribution_version'] }}
diff --git a/tripleo_ansible/roles/aide/tasks/aide_config.yml b/tripleo_ansible/roles/aide/tasks/aide_config.yml
index dbb0dfaa3..4e8d6c549 100644
--- a/tripleo_ansible/roles/aide/tasks/aide_config.yml
+++ b/tripleo_ansible/roles/aide/tasks/aide_config.yml
@@ -64,7 +64,7 @@
       --check
       --config {{ aide_conf_path }}
       | {{ aide_mua_path }}
-      -s '{{ ansible_fqdn }} - AIDE integrity check' {{ aide_email }}
+      -s '{{ ansible_facts['fqdn'] }} - AIDE integrity check' {{ aide_email }}
   when:
     - aide_email.find("v=" ~ "@") == -1
 
diff --git a/tripleo_ansible/roles/aide/tasks/main.yml b/tripleo_ansible/roles/aide/tasks/main.yml
index 0566fe298..757523b8f 100644
--- a/tripleo_ansible/roles/aide/tasks/main.yml
+++ b/tripleo_ansible/roles/aide/tasks/main.yml
@@ -22,12 +22,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml b/tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml
index 6462c3cf4..195938157 100644
--- a/tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml
+++ b/tripleo_ansible/roles/backup-and-restore/backup/tasks/main.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/backup-and-restore/setup_nfs/tasks/main.yml b/tripleo_ansible/roles/backup-and-restore/setup_nfs/tasks/main.yml
index 9a799f062..3fdc878e0 100644
--- a/tripleo_ansible/roles/backup-and-restore/setup_nfs/tasks/main.yml
+++ b/tripleo_ansible/roles/backup-and-restore/setup_nfs/tasks/main.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/backup-and-restore/setup_rear/tasks/main.yml b/tripleo_ansible/roles/backup-and-restore/setup_rear/tasks/main.yml
index 3cd13b143..69e5fe691 100644
--- a/tripleo_ansible/roles/backup-and-restore/setup_rear/tasks/main.yml
+++ b/tripleo_ansible/roles/backup-and-restore/setup_rear/tasks/main.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/backup-and-restore/tasks/ceph_authentication.yml b/tripleo_ansible/roles/backup-and-restore/tasks/ceph_authentication.yml
index e27540505..05f11e997 100644
--- a/tripleo_ansible/roles/backup-and-restore/tasks/ceph_authentication.yml
+++ b/tripleo_ansible/roles/backup-and-restore/tasks/ceph_authentication.yml
@@ -23,19 +23,19 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
 - name: Export ceph authentication
   shell: |
     set -o pipefail
-    {{ tripleo_container_cli }} exec ceph-mon-{{ ansible_hostname }} bash -c "ceph auth export" > {{ tripleo_backup_and_restore_ceph_auth_file }}
+    {{ tripleo_container_cli }} exec ceph-mon-{{ ansible_facts['hostname'] }} bash -c "ceph auth export" > {{ tripleo_backup_and_restore_ceph_auth_file }}
   become: true
   tags:
     - bar_create_recover_image
diff --git a/tripleo_ansible/roles/backup-and-restore/tasks/main.yml b/tripleo_ansible/roles/backup-and-restore/tasks/main.yml
index 48227d38e..269487489 100644
--- a/tripleo_ansible/roles/backup-and-restore/tasks/main.yml
+++ b/tripleo_ansible/roles/backup-and-restore/tasks/main.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/backup-and-restore/tasks/setup_nfs.yml b/tripleo_ansible/roles/backup-and-restore/tasks/setup_nfs.yml
index 9af256748..3161bacca 100644
--- a/tripleo_ansible/roles/backup-and-restore/tasks/setup_nfs.yml
+++ b/tripleo_ansible/roles/backup-and-restore/tasks/setup_nfs.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/backup-and-restore/tasks/setup_rear.yml b/tripleo_ansible/roles/backup-and-restore/tasks/setup_rear.yml
index abbf8dbdf..460d14d6c 100644
--- a/tripleo_ansible/roles/backup-and-restore/tasks/setup_rear.yml
+++ b/tripleo_ansible/roles/backup-and-restore/tasks/setup_rear.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/octavia-undercloud/tasks/main.yml b/tripleo_ansible/roles/octavia-undercloud/tasks/main.yml
index d12419a16..f01128149 100644
--- a/tripleo_ansible/roles/octavia-undercloud/tasks/main.yml
+++ b/tripleo_ansible/roles/octavia-undercloud/tasks/main.yml
@@ -11,14 +11,14 @@
   set_fact:
     image_filename: "/usr/share/openstack-octavia-amphora-images/amphora-x64-haproxy.qcow2"
   when:
-    - ansible_distribution == 'CentOS'
+    - ansible_facts['distribution'] == 'CentOS'
     - not (image_filename is defined)
 
 - name: set location if Red Hat
   set_fact:
     image_filename: "/usr/share/openstack-octavia-amphora-images/octavia-amphora.qcow2"
   when:
-    - ansible_distribution == 'RedHat'
+    - ansible_facts['distribution'] == 'RedHat'
     - not (image_filename is defined)
 
 - name: check if amphora image file exists
diff --git a/tripleo_ansible/roles/test_deps/defaults/main.yml b/tripleo_ansible/roles/test_deps/defaults/main.yml
index da6681cc8..4bc5abdfb 100644
--- a/tripleo_ansible/roles/test_deps/defaults/main.yml
+++ b/tripleo_ansible/roles/test_deps/defaults/main.yml
@@ -17,5 +17,5 @@
 
 test_deps_extra_packages: []
 test_deps_setup_tripleo: false
-test_deps_repo_version: "{{ ansible_distribution | lower }}{{ ansible_distribution_major_version }}-master"
+test_deps_repo_version: "{{ ansible_facts['distribution'] | lower }}{{ ansible_facts['distribution_major_version'] }}-master"
 test_deps_mirrors_file_path: /etc/ci/mirror_info.sh
diff --git a/tripleo_ansible/roles/test_deps/tasks/main.yml b/tripleo_ansible/roles/test_deps/tasks/main.yml
index e451b67f5..c3b17c1d7 100644
--- a/tripleo_ansible/roles/test_deps/tasks/main.yml
+++ b/tripleo_ansible/roles/test_deps/tasks/main.yml
@@ -22,12 +22,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
@@ -39,12 +39,12 @@
 - name: RHEL Block
   become: true
   when:
-    - (ansible_os_family | lower) == 'redhat'
+    - (ansible_facts['os_family'] | lower) == 'redhat'
     - mirrors_file.stat.exists | bool
   block:
     - name: Fetch latest repo version
       uri:
-        url: https://trunk.rdoproject.org/centos{{ ansible_distribution_major_version }}/current/delorean.repo
+        url: https://trunk.rdoproject.org/centos{{ ansible_facts['distribution_major_version'] }}/current/delorean.repo
         return_content: true
       register: tripleo_packages
 
@@ -63,7 +63,7 @@
 - name: Tripleo setup block
   become: true
   when:
-    - (ansible_os_family | lower) == 'redhat'
+    - (ansible_facts['os_family'] | lower) == 'redhat'
     - test_deps_setup_tripleo | bool
   block:
     - name: Create tripleo repos
@@ -93,7 +93,7 @@
         name: "{{ test_deps_selinux_packages }}"
         state: present
       when:
-        - (ansible_os_family | lower) == 'redhat'
+        - (ansible_facts['os_family'] | lower) == 'redhat'
 
     - name: Install extra packages
       package:
diff --git a/tripleo_ansible/roles/test_package_action/tasks/main.yml b/tripleo_ansible/roles/test_package_action/tasks/main.yml
index a21a3cd68..9f9122743 100644
--- a/tripleo_ansible/roles/test_package_action/tasks/main.yml
+++ b/tripleo_ansible/roles/test_package_action/tasks/main.yml
@@ -22,12 +22,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tripleo-bootstrap/tasks/main.yml b/tripleo_ansible/roles/tripleo-bootstrap/tasks/main.yml
index fb274987a..e24020585 100644
--- a/tripleo_ansible/roles/tripleo-bootstrap/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-bootstrap/tasks/main.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
@@ -41,7 +41,7 @@
   # ignore the case where the package can't be found (e.g. missing subscription).
   # https://bugzilla.redhat.com/show_bug.cgi?id=1820306
   failed_when:
-    - (ansible_distribution | lower) == 'redhat'
+    - (ansible_facts['distribution'] | lower) == 'redhat'
     - not ansible_check_mode|bool
     - (tripleo_bootstrap_packages_bootstrap_result.rc | int) == 1
     - not ('No package openvswitch available.' in tripleo_bootstrap_packages_bootstrap_result.failures | default([]))
@@ -98,7 +98,7 @@
 
 - name: Create empty ruleset in /etc/sysconfig/iptables and /etc/sysconfig/ip6tables
   become: true
-  ignore_errors: "{{ (((ansible_os_family | lower) ~ '-' ~ ansible_distribution_major_version) == 'redhat-7') | bool }}"
+  ignore_errors: "{{ (((ansible_facts['os_family'] | lower) ~ '-' ~ ansible_distribution_major_version) == 'redhat-7') | bool }}"
   copy:
     dest: "{{ item }}"
     content: "# empty ruleset created by deployed-server bootstrap"
diff --git a/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml b/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml
index 0491650a1..69578fe1a 100644
--- a/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-clients-install/tasks/main.yml
@@ -20,12 +20,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tripleo-container-manage/tasks/main.yml b/tripleo_ansible/roles/tripleo-container-manage/tasks/main.yml
index ac6174037..178261465 100644
--- a/tripleo_ansible/roles/tripleo-container-manage/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-container-manage/tasks/main.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tripleo-firewall/tasks/main.yml b/tripleo_ansible/roles/tripleo-firewall/tasks/main.yml
index 61e60949d..8f0813abb 100644
--- a/tripleo_ansible/roles/tripleo-firewall/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-firewall/tasks/main.yml
@@ -19,12 +19,12 @@
 - 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+    - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tripleo-kernel/tasks/reboot.yaml b/tripleo_ansible/roles/tripleo-kernel/tasks/reboot.yaml
index 19cb8820e..e900b6c11 100644
--- a/tripleo_ansible/roles/tripleo-kernel/tasks/reboot.yaml
+++ b/tripleo_ansible/roles/tripleo-kernel/tasks/reboot.yaml
@@ -54,10 +54,10 @@
       when:
         - item.path | regex_replace('(^.*ifcfg-)(.*)', '\\2') != "lo"
         # Ensure the interface information is available in the facts
-        - hostvars[inventory_hostname]['ansible_' + item.path | regex_replace('(^.*ifcfg-)(.*)', '\\2') | replace('-', '_') ] is defined
+        - hostvars[inventory_hostname]['ansible_facts'][item.path | regex_replace('(^.*ifcfg-)(.*)', '\\2') | replace('-', '_')] is defined
         # This condition will list all the interfaces except the one with valid IP (which is Provisioning network at this stage)
         # Simpler Version - hostvars[inventory_hostname]['ansible_' + iface_name ]['ipv4'] is undefined
-        - hostvars[inventory_hostname]['ansible_' + item.path | regex_replace('(^.*ifcfg-)(.*)', '\\2') | replace('-', '_') ]['ipv4'] is undefined
+        - hostvars[inventory_hostname]['ansible_facts'][item.path | regex_replace('(^.*ifcfg-)(.*)', '\\2') | replace('-', '_')]['ipv4'] is undefined
       with_items:
         - "{{ ifcfg_files.files }}"
   become: true
diff --git a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml
index 232b1647d..cbb6f2f4c 100644
--- a/tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-keystone-resources/tasks/main.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tripleo-network-config/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo-network-config/molecule/default/prepare.yml
index a4ac43618..3134404bf 100644
--- a/tripleo_ansible/roles/tripleo-network-config/molecule/default/prepare.yml
+++ b/tripleo_ansible/roles/tripleo-network-config/molecule/default/prepare.yml
@@ -26,4 +26,4 @@
         name: network-scripts
         state: present
       when:
-        - ansible_distribution_major_version|int == 8
+        - ansible_facts['distribution_major_version'] is version('8', '==')
diff --git a/tripleo_ansible/roles/tripleo-nova-image-cache/tasks/main.yml b/tripleo_ansible/roles/tripleo-nova-image-cache/tasks/main.yml
index d4faa4247..13d08fd8b 100644
--- a/tripleo_ansible/roles/tripleo-nova-image-cache/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-nova-image-cache/tasks/main.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tripleo-packages/tasks/fast_forward_upgrade.yml b/tripleo_ansible/roles/tripleo-packages/tasks/fast_forward_upgrade.yml
index 484ee1c39..d2e282745 100644
--- a/tripleo_ansible/roles/tripleo-packages/tasks/fast_forward_upgrade.yml
+++ b/tripleo_ansible/roles/tripleo-packages/tasks/fast_forward_upgrade.yml
@@ -17,7 +17,7 @@
 
 - name: set is_bootstrap_node fact
   set_fact:
-    is_bootstrap_node: "{{ tripleo_packages_short_bootstrap_node_name|lower == ansible_hostname|lower }}"
+    is_bootstrap_node: "{{ tripleo_packages_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower }}"
 
 - name: Debug fast forward upgrade repo variables
   debug:
diff --git a/tripleo_ansible/roles/tripleo-packages/tasks/upgrade.yml b/tripleo_ansible/roles/tripleo-packages/tasks/upgrade.yml
index fba510692..d4a9b25c5 100644
--- a/tripleo_ansible/roles/tripleo-packages/tasks/upgrade.yml
+++ b/tripleo_ansible/roles/tripleo-packages/tasks/upgrade.yml
@@ -108,7 +108,7 @@
           - python3-heat-agent*
         state: present
       when:
-        - ansible_distribution_major_version == '8'
+        - ansible_facts['distribution_major_version'] is version('8', '==')
 
 # With the layered product packaging, the key package is rhosp-openvswitch. It depends on
 # a openvswitch package that includes the version as part of the name (e.g openvswitch2.10).
diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/load_vars.yaml b/tripleo_ansible/roles/tripleo-podman/tasks/load_vars.yaml
index 3c710231b..e6f91045a 100644
--- a/tripleo_ansible/roles/tripleo-podman/tasks/load_vars.yaml
+++ b/tripleo_ansible/roles/tripleo-podman/tasks/load_vars.yaml
@@ -24,9 +24,9 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_docker_purge.yml b/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_docker_purge.yml
index 541635f87..a99765cab 100644
--- a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_docker_purge.yml
+++ b/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_docker_purge.yml
@@ -55,12 +55,13 @@
       setup:
         gather_subset:
           - hardware
+        filter: 'ansible_mounts'
 
     - name: Un-mount docker directories
       mount:
         path: "{{ item.mount }}"
         state: unmounted
-      loop: "{{ ansible_mounts | selectattr('mount', 'search', 'docker') | list }}"
+      loop: "{{ ansible_facts['mounts'] | selectattr('mount', 'search', 'docker') | list }}"
 
     - name: Purge /var/lib/docker
       file:
diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_buildah_login.yml b/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_buildah_login.yml
index 63247abc6..947c2063d 100644
--- a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_buildah_login.yml
+++ b/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_buildah_login.yml
@@ -19,12 +19,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
 
 - name: ensure buildah is installed
   become: true
diff --git a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml b/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml
index c3caebc33..27e4fe085 100644
--- a/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml
+++ b/tripleo_ansible/roles/tripleo-podman/tasks/tripleo_podman_install.yml
@@ -26,9 +26,9 @@
         name: "{{ tripleo_podman_packages }}"
         state: latest
 
-    - name: Ensure we get the ansible_interfaces fact
+    - name: Ensure we get the ansible interfaces facts
       when:
-        - ansible_interfaces is undefined
+        - ansible_facts['interfaces'] is undefined
       setup:
         gather_subset:
           - '!all'
@@ -39,7 +39,7 @@
     - name: Delete legacy cni0 interface (podman < 1.6)
       command: ip link delete cni0
       when:
-        - '"cni0" in ansible_interfaces'
+        - '"cni0" in ansible_facts["interfaces"]'
 
     # don't update the network config if the network is already running
     # meaning cni-podman0 is running somewhere
@@ -51,8 +51,7 @@
         owner: root
         group: root
       when:
-        - '"cni-podman0" not in ansible_interfaces'
-
+        - '"cni-podman0" not in ansible_facts["interfaces"]'
 
     - name: configure insecure registries /etc/containers/registries.conf
       ini_file:
diff --git a/tripleo_ansible/roles/tripleo-ptp/defaults/main.yml b/tripleo_ansible/roles/tripleo-ptp/defaults/main.yml
index a086e920b..a2278e037 100644
--- a/tripleo_ansible/roles/tripleo-ptp/defaults/main.yml
+++ b/tripleo_ansible/roles/tripleo-ptp/defaults/main.yml
@@ -18,7 +18,7 @@
 # All variables intended for modification should place placed in this file.
 
 tripleo_ptp_slave_mode: 1
-tripleo_ptp_interfaces: ["{{ ansible_default_ipv4.interface }}"]
+tripleo_ptp_interfaces: []
 tripleo_ptp_transport: UDPv4
 tripleo_ptp_hardware_offload: false
 
diff --git a/tripleo_ansible/roles/tripleo-ptp/tasks/main.yml b/tripleo_ansible/roles/tripleo-ptp/tasks/main.yml
index 402cf9891..9f8f3d0e3 100644
--- a/tripleo_ansible/roles/tripleo-ptp/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-ptp/tasks/main.yml
@@ -23,15 +23,31 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
+- name: Get default interface network facts
+  setup:
+    gather_subset:
+      - '!all'
+      - '!any'
+      - network
+    filter: 'ansible_default_ipv4'
+
+- name: Set default ptp interface
+  set_fact:
+    tripleo_ptp_interfaces: ["{{ ansible_facts['default_ipv4']['interface'] }}"]
+  when:
+    - tripleo_ptp_interfaces | length == 0
+    - ansible_facts['default_ipv4'] is defined
+    - ansible_facts['default_ipv4']['interface'] is defined
+
 - name: Run ptp tasks
   include_tasks: tripleo_ptp.yml
 
diff --git a/tripleo_ansible/roles/tripleo-ptp/tasks/tripleo_ptp.yml b/tripleo_ansible/roles/tripleo-ptp/tasks/tripleo_ptp.yml
index 898936e93..a564682c6 100644
--- a/tripleo_ansible/roles/tripleo-ptp/tasks/tripleo_ptp.yml
+++ b/tripleo_ansible/roles/tripleo-ptp/tasks/tripleo_ptp.yml
@@ -21,11 +21,6 @@
     state: present
   register: _ptp_install_result
 
-- name: Collect only facts returned by facter
-  setup:
-    gather_subset:
-      - network
-
 # NOTE(cloudnull): In the future, we could potentially revisit this once the Heat
 #                  template for the "kernel" sysctl settings has been converted into
 #                  an Ansible role and re-use the functionality of that.
diff --git a/tripleo_ansible/roles/tripleo-redhat-enforce/tasks/main.yml b/tripleo_ansible/roles/tripleo-redhat-enforce/tasks/main.yml
index 2d7383485..617ebd947 100644
--- a/tripleo_ansible/roles/tripleo-redhat-enforce/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-redhat-enforce/tasks/main.yml
@@ -27,12 +27,12 @@
   when:
     - include_file is exists
   vars:
-    include_file: "{{ role_path }}/vars/{{ ansible_distribution | lower }}.yml"
+    include_file: "{{ role_path }}/vars/{{ ansible_facts['distribution'] | lower }}.yml"
   tags:
     - always
 
 - include_tasks: enforce_release.yml
   name: Enforce RHEL/OSP version pair
   when:
-    - (ansible_distribution | lower) == "redhat"
+    - (ansible_facts['distribution'] | lower) == "redhat"
     - tripleo_redhat_enforce|bool
diff --git a/tripleo_ansible/roles/tripleo-sshd/tasks/main.yml b/tripleo_ansible/roles/tripleo-sshd/tasks/main.yml
index 2575b46a7..4c6f6e82e 100644
--- a/tripleo_ansible/roles/tripleo-sshd/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-sshd/tasks/main.yml
@@ -20,12 +20,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tripleo-systemd-wrapper/tasks/main.yml b/tripleo_ansible/roles/tripleo-systemd-wrapper/tasks/main.yml
index d335b6f09..0b7f32be6 100644
--- a/tripleo_ansible/roles/tripleo-systemd-wrapper/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo-systemd-wrapper/tasks/main.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tripleo_ha_wrapper/tasks/main.yml b/tripleo_ansible/roles/tripleo_ha_wrapper/tasks/main.yml
index ec4381869..086bdd450 100644
--- a/tripleo_ansible/roles/tripleo_ha_wrapper/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo_ha_wrapper/tasks/main.yml
@@ -38,12 +38,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml b/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml
index 662f9baed..8aa437c74 100644
--- a/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo_lvmfilter/tasks/main.yml
@@ -26,13 +26,20 @@
     - lvm_pkg_check.rc == 0
     - tripleo_tripleo_lvmfilter_enabled or tripleo_tripleo_lvmfilter_dry_run
   block:
+    - name: collect ansible devices
+      become: true
+      setup:
+        gather_subset:
+          - '!all'
+          - devices
+        filter: 'ansible_devices'
     - name: collect in-use lvm2 devices list
       become: true
       lvm2_physical_devices_facts:
     - name: set allowed_devices
       set_fact:
         allowed_devices: "{{ (ansible_facts['lvm2_active_pvs'] | default([]) | list)
-                         | intersect(ansible_devices.keys())
+                         | intersect(ansible_facts['devices'].keys())
                          + (tripleo_tripleo_lvmfilter_devices_allowlist | default([]))
                          | unique }}"
     - name: build lvm2 allow list
diff --git a/tripleo_ansible/roles/tripleo_nvdimm/tasks/main.yml b/tripleo_ansible/roles/tripleo_nvdimm/tasks/main.yml
index 5aea8265e..f6372412a 100644
--- a/tripleo_ansible/roles/tripleo_nvdimm/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo_nvdimm/tasks/main.yml
@@ -22,12 +22,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tripleo_provision_mcelog/tasks/main.yml b/tripleo_ansible/roles/tripleo_provision_mcelog/tasks/main.yml
index 6ffe361ea..6d82a24c0 100644
--- a/tripleo_ansible/roles/tripleo_provision_mcelog/tasks/main.yml
+++ b/tripleo_ansible/roles/tripleo_provision_mcelog/tasks/main.yml
@@ -23,12 +23,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always
 
diff --git a/tripleo_ansible/roles/tuned/tasks/main.yml b/tripleo_ansible/roles/tuned/tasks/main.yml
index d16931359..ed3e23279 100644
--- a/tripleo_ansible/roles/tuned/tasks/main.yml
+++ b/tripleo_ansible/roles/tuned/tasks/main.yml
@@ -22,12 +22,12 @@
   with_first_found:
     - skip: true
       files:
-        - "{{ 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 }}-{{ ansible_distribution_version.split('.')[0] }}.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 }}-{{ ansible_facts['distribution_version'].split('.')[0] }}.yml"
+        - "{{ ansible_facts['os_family'] | lower }}.yml"
   tags:
     - always