diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index 2d5cd2d943..60bd714073 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -164,7 +164,7 @@
 # Bootstrap tasks - run any tasks that have been defined
 ########################################################
 
-- name: "Clean container_puppet_tasks for {{ansible_hostname | lower}} step {{step}}"
+- name: "Clean container_puppet_tasks for {{ansible_facts['hostname'] | lower}} step {{step}}"
   become: true
   file:
     path: /var/lib/container-puppet/container-puppet-tasks{{step}}.json
@@ -172,11 +172,11 @@
   tags:
     - container_config_tasks
 
-- name: Calculate container_puppet_tasks for {{ansible_hostname | lower}} step {{step}}
+- name: Calculate container_puppet_tasks for {{ansible_facts['hostname'] | lower}} step {{step}}
   set_fact:
     "{{'host_container_puppet_tasks_' ~ step}}": "{{lookup('vars', 'host_container_puppet_tasks_' ~ step, default=[]) | union([item])}}"
   loop: "{{container_puppet_tasks.get('step_' ~ step, [])}}"
-  when: (groups[item.service_name] | default ([]) | map('extract', hostvars, 'inventory_hostname') | sort | first | lower) == ansible_hostname | lower
+  when: (groups[item.service_name] | default ([]) | map('extract', hostvars, 'inventory_hostname') | sort | first | lower) == ansible_facts['hostname'] | lower
   vars:
     container_puppet_tasks: "{{ lookup('file', tripleo_role_name + '/container_puppet_tasks.yaml', errors='ignore') | default({}, True) | from_yaml }}"
   tags:
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 4095943939..a95d013562 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -1105,9 +1105,9 @@ outputs:
                   loop_control:
                     loop_var: step
                   tags: always
-                  # we use ansible_hostname to determine if the host is alive
+                  # we use ansible_facts['hostname'] to determine if the host is alive
                   # or not.
-                  when: ansible_hostname is defined
+                  when: ansible_facts['hostname'] is defined
                 # We don't want to run the scale tasks on dead nodes, to allow
                 # the operator to scale down the cloud no matter the state of
                 # the servers.
@@ -1118,9 +1118,9 @@ outputs:
                     msg: "Node is unreachable. No scale tasks will be run."
                   ignore_errors: True
                   tags: always
-                  # we use ansible_hostname to determine if the host is alive
+                  # we use ansible_facts['hostname'] to determine if the host is alive
                   # or not.
-                  when: ansible_hostname is not defined
+                  when: ansible_facts['hostname'] is not defined
               tags:
                 - scale
       post_update_steps_tasks: |
diff --git a/common/generate-config-tasks.yaml b/common/generate-config-tasks.yaml
index c5e8886608..dbf23672cd 100644
--- a/common/generate-config-tasks.yaml
+++ b/common/generate-config-tasks.yaml
@@ -1,13 +1,13 @@
 - name: Gather facts needed by role if necessary
   setup:
     gather_subset: "!min,python"
-  when: ansible_python is not defined
+  when: ansible_facts['python'] is not defined
   tags:
     - container_config_tasks
 
 - name: set python_cmd if necessary
   set_fact:
-    python_cmd: "python{{ ansible_python.version.major }}"
+    python_cmd: "python{{ ansible_facts['python']['version']['major'] }}"
     cacheable: true
   when: python_cmd is not defined
   tags:
@@ -35,7 +35,7 @@
         MOUNT_HOST_PUPPET: '{{docker_puppet_mount_host_puppet | default(true)}}'
         CONTAINER_LOG_STDOUT_PATH: "{{ container_log_stdout_path }}"
         CONTAINER_HEALTHCHECK_DISABLED: "{{ container_healthcheck_disabled }}"
-        SHORT_HOSTNAME: "{{ ansible_hostname | lower }}"
+        SHORT_HOSTNAME: "{{ ansible_facts['hostname'] | lower }}"
       check_mode: no
       register: generate_config_async_result
 
@@ -77,7 +77,7 @@
         net_host: true
         no_archive: false
         puppet_config: "/var/lib/container-puppet/{{ ansible_check_mode | bool | ternary('check-mode/', '') }}container-puppet.json"
-        short_hostname: "{{ ansible_hostname | lower }}"
+        short_hostname: "{{ ansible_facts['hostname'] | lower }}"
         step: "{{ step }}"
 
     - name: "Manage Puppet containers (generate config) for step {{ step }} with tripleo-ansible"
diff --git a/common/host-container-puppet-tasks.yaml b/common/host-container-puppet-tasks.yaml
index 1fba118a80..d88aa10129 100644
--- a/common/host-container-puppet-tasks.yaml
+++ b/common/host-container-puppet-tasks.yaml
@@ -1,4 +1,4 @@
-- name: Write container-puppet-tasks json file for {{ansible_hostname | lower}} step {{step}}
+- name: Write container-puppet-tasks json file for {{ansible_facts['hostname'] | lower}} step {{step}}
   no_log: True
   copy:
     content: "{{lookup ('vars', 'host_container_puppet_tasks_' ~ step, default=[]) | to_nice_json}}"
@@ -12,13 +12,13 @@
 - name: Gather ansible facts if necessary
   setup:
     gather_subset: "!min,python"
-  when: ansible_python is not defined
+  when: ansible_facts['python'] is not defined
   tags:
     - container_config_tasks
 
 - name: Set python_cmd if necessary
   set_fact:
-    python_cmd: "python{{ ansible_python.version.major }}"
+    python_cmd: "python{{ ansible_facts['python']['version']['major'] }}"
     cacheable: true
   when: python_cmd is not defined
   tags:
@@ -43,7 +43,7 @@
         CONTAINER_CLI: "{{ container_cli }}"
         DEBUG: "{{ docker_puppet_debug }}"
         MOUNT_HOST_PUPPET: '{{docker_puppet_mount_host_puppet}}'
-        SHORT_HOSTNAME: "{{ ansible_hostname | lower }}"
+        SHORT_HOSTNAME: "{{ ansible_facts['hostname'] | lower }}"
         PROCESS_COUNT: "{{ docker_puppet_process_count }}"
       register: bootstrap_tasks_async_result
       no_log: true
@@ -77,7 +77,7 @@
         net_host: true
         no_archive: true
         puppet_config: "/var/lib/container-puppet/{{ ansible_check_mode | bool | ternary('check-mode/', '') }}container-puppet-tasks{{ step }}.json"
-        short_hostname: "{{ ansible_hostname | lower }}"
+        short_hostname: "{{ ansible_facts['hostname'] | lower }}"
         step: "{{ step }}"
 
     - name: "Manage Puppet containers (bootstrap tasks) for step {{ step }} with tripleo-ansible"
diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
index bc558488aa..63aa6329d7 100644
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
@@ -305,7 +305,7 @@ outputs:
                 cinder_backup_pcs_res: "{{cinder_backup_pcs_res_result.rc == 0}}"
             - name: set is_cinder_backup_bootstrap_node fact
               tags: common
-              set_fact: is_cinder_backup_bootstrap_node={{cinder_backup_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_cinder_backup_bootstrap_node={{cinder_backup_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}
         - name: Update cinder_backup pcs resource bundle for new container image
           when:
             - step|int == 1
diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
index 72a5924620..dc72565aaf 100644
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@@ -286,7 +286,7 @@ outputs:
                 cinder_volume_pcs_res: "{{cinder_volume_pcs_res_result.rc == 0}}"
             - name: set is_cinder_volume_bootstrap_node fact
               tags: common
-              set_fact: is_cinder_volume_bootstrap_node={{cinder_volume_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_cinder_volume_bootstrap_node={{cinder_volume_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}
         - name: Update cinder_volume pcs resource bundle for new container image
           when:
             - step|int == 1
diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml
index 5529f86cd8..6ec73b5a31 100644
--- a/deployment/database/mysql-pacemaker-puppet.yaml
+++ b/deployment/database/mysql-pacemaker-puppet.yaml
@@ -473,7 +473,7 @@ outputs:
                 galera_pcs_res: "{{galera_pcs_res_result.rc == 0}}"
             - name: set is_mysql_bootstrap_node fact
               tags: common
-              set_fact: is_mysql_bootstrap_node={{mysql_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_mysql_bootstrap_node={{mysql_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}
         - name: Update galera pcs resource bundle for new container image
           when:
             - step|int == 1
diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml
index 218c4fd6e6..db42df2b68 100644
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@@ -384,7 +384,7 @@ outputs:
             - name: Set upgrade redis facts
               set_fact:
                 redis_pcs_res: "{{redis_pcs_res_result.rc == 0}}"
-                is_redis_bootstrap_node: "{{redis_short_bootstrap_node_name|lower == ansible_hostname|lower}}"
+                is_redis_bootstrap_node: "{{redis_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}"
         - name: Update redis-bundle pcs resource bundle for new container image
           when:
             - step|int == 1
diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
index 468725a4de..5d4e8032a8 100644
--- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml
+++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
@@ -338,7 +338,7 @@ outputs:
           block: &haproxy_update_upgrade_facts
           - name: set is_haproxy_bootstrap_node fact
             tags: common
-            set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+            set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}
             when:
               - haproxy_short_bootstrap_node_name|default(false)
         - name: Mount TLS cert if needed
@@ -453,7 +453,7 @@ outputs:
             - name: Set upgrade haproxy facts
               set_fact:
                 haproxy_pcs_res: "{{haproxy_pcs_res_result.rc == 0}}"
-                is_haproxy_bootstrap_node: "{{haproxy_short_bootstrap_node_name|lower == ansible_hostname|lower}}"
+                is_haproxy_bootstrap_node: "{{haproxy_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}"
 
         - name: Update haproxy pcs resource bundle for new container image
           when:
diff --git a/deployment/haproxy/haproxy-public-tls-inject.yaml b/deployment/haproxy/haproxy-public-tls-inject.yaml
index afd5703184..6701856d18 100644
--- a/deployment/haproxy/haproxy-public-tls-inject.yaml
+++ b/deployment/haproxy/haproxy-public-tls-inject.yaml
@@ -85,7 +85,7 @@ outputs:
                 path: "{{cert_path}}"
 
             - name: set is_haproxy_bootstrap_node fact
-              set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name | lower == ansible_hostname | lower}}
+              set_fact: is_haproxy_bootstrap_node={{haproxy_short_bootstrap_node_name | lower == ansible_facts['hostname'] | lower}}
               when:
                 - haproxy_short_bootstrap_node_name|default(false)
 
diff --git a/deployment/ipa/ipaservices-baremetal-ansible.yaml b/deployment/ipa/ipaservices-baremetal-ansible.yaml
index 9d916ad322..cfb1a88a3d 100644
--- a/deployment/ipa/ipaservices-baremetal-ansible.yaml
+++ b/deployment/ipa/ipaservices-baremetal-ansible.yaml
@@ -116,9 +116,9 @@ outputs:
             if:
               - idm_server_provided
               - IPA_HOST: {get_param: IdMServer}
-                IPA_USER: "nova/{{ ansible_fqdn }}"
+                IPA_USER: "nova/{{ ansible_facts['fqdn'] }}"
                 KRB5_CLIENT_KTNAME: {get_param: IdMNovaKeytab}
-              - IPA_USER: "nova/{{ ansible_fqdn }}"
+              - IPA_USER: "nova/{{ ansible_facts['fqdn'] }}"
                 KRB5_CLIENT_KTNAME: {get_param: IdMNovaKeytab}
       deploy_steps_tasks:
         - name: enroll the node as an ipa client
diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml
index ec08ce9126..be34606ccc 100644
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/deployment/manila/manila-share-pacemaker-puppet.yaml
@@ -262,7 +262,7 @@ outputs:
                 manila_share_pcs_res: "{{manila_share_pcs_res_result.rc == 0}}"
             - name: set is_manila_share_bootstrap_node fact
               tags: common
-              set_fact: is_manila_share_bootstrap_node={{manila_share_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_manila_share_bootstrap_node={{manila_share_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}
         - name: Update openstack-manila-share pcs resource bundle for new container image
           when:
             - step|int == 1
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index 97ade8e583..84cd80f0b4 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -1207,7 +1207,7 @@ outputs:
               register: iha_nodes
             - name: If instance HA is enabled on the node activate the evacuation completed check
               file: path=/var/lib/nova/instanceha/enabled state=touch
-              when: iha_nodes.stdout|lower is search('"'+ansible_hostname|lower+'"')
+              when: iha_nodes.stdout|lower is search('"'+ansible_facts['hostname']|lower+'"')
           - name: Is irqbalance enabled
             set_fact:
               compute_irqbalance_disabled: {get_attr: [RoleParametersValue, value, compute_disable_irqbalance]}
@@ -1289,21 +1289,21 @@ outputs:
                 name: qemu-kvm-common-ev
                 state: present
               when:
-                - ansible_distribution == 'CentOS'
-                - ansible_distribution_major_version == '7'
+                - ansible_facts['distribution'] == 'CentOS'
+                - ansible_facts['distribution_major_version'] is version('7', '==')
             - name: make sure package providing ksmtuned is installed (RHEL7)
               package:
                 name: qemu-kvm-common-rhev
                 state: present
               when:
-                - ansible_distribution == 'RedHat'
-                - ansible_distribution_major_version == '7'
+                - ansible_facts['distribution'] == 'RedHat'
+                - ansible_facts['distribution_major_version'] is version('7', '==')
             - name: make sure package providing ksmtuned is installed (RHEL8 or CentOS8)
               package:
                 name: qemu-kvm-common
                 state: present
               when:
-                - ansible_distribution_major_version == '8'
+                - ansible_facts['distribution_major_version'] is version('8', '==')
             - name: enable ksmtunded
               service:
                 name: "{{ item }}"
@@ -1359,13 +1359,13 @@ outputs:
                 is_additional_cell: {get_param: NovaAdditionalCell}
             - name: Set fact for nova_compute services
               set_fact:
-                nova_compute_service: "{{ nova_compute_service_result.stdout | from_yaml | selectattr('Host', 'match', ansible_fqdn ~ '.*') | list }}"
+                nova_compute_service: "{{ nova_compute_service_result.stdout | from_yaml | selectattr('Host', 'match', ansible_facts['fqdn'] ~ '.*') | list }}"
               delegate_to: localhost
               check_mode: no
             - name: Check search output
               fail:
                 msg: >-
-                  Found multiple `{{ ansible_fqdn }}`, which is unexpected.
+                  Found multiple `{{ ansible_facts['fqdn'] }}`, which is unexpected.
                   This means that the FQDN of the selected device to disable is
                   either wrong or is sharing a name with another host, which is
                   also wrong. Please correct this issue before continuing. Nova
diff --git a/deployment/nova/novajoin-container-puppet.yaml b/deployment/nova/novajoin-container-puppet.yaml
index 36d8e98bc7..0f148e4fcd 100644
--- a/deployment/nova/novajoin-container-puppet.yaml
+++ b/deployment/nova/novajoin-container-puppet.yaml
@@ -237,8 +237,8 @@ outputs:
         # openssl-perl is installed which provides /etc/pki/CA on RHEL8
         - name: Ensure openssl-perl package is present on RHEL8
           when:
-            - ansible_os_family == 'RedHat'
-            - ansible_distribution_major_version == '8'
+            - ansible_facts['os_family'] == 'RedHat'
+            - ansible_facts['distribution_major_version'] is version('8', '==')
           package:
             name: openssl-perl
             state: present
@@ -264,6 +264,6 @@ outputs:
             creates: /etc/ipa/default.conf
           when: ipa_otp != ''
         - name: Request kerberos keytab
-          shell: "/usr/bin/kinit -kt /etc/krb5.keytab && ipa-getkeytab -s $(grep xmlrpc_uri /etc/ipa/default.conf  | cut -d/ -f3) -p nova/{{ ansible_nodename }} -k /etc/novajoin/krb5.keytab"
+          shell: "/usr/bin/kinit -kt /etc/krb5.keytab && ipa-getkeytab -s $(grep xmlrpc_uri /etc/ipa/default.conf  | cut -d/ -f3) -p nova/{{ ansible_facts['nodename'] }} -k /etc/novajoin/krb5.keytab"
           args:
             creates: /etc/novajoin/krb5.keytab
diff --git a/deployment/octavia/octavia-deployment-config.j2.yaml b/deployment/octavia/octavia-deployment-config.j2.yaml
index 1315cfc1f2..dc7d979284 100644
--- a/deployment/octavia/octavia-deployment-config.j2.yaml
+++ b/deployment/octavia/octavia-deployment-config.j2.yaml
@@ -303,7 +303,7 @@ outputs:
                   {%- if 'octavia_' ~ octavia_groups %}
 
                       {% for host in groups['octavia_' ~ octavia_group] -%}
-                      {{ hostvars.raw_get(host)['ansible_hostname'] | lower}}:
+                      {{ hostvars.raw_get(host)['ansible_facts']['hostname'] | lower}}:
                         ansible_user: {{ hostvars.raw_get(host)['ansible_ssh_user'] | default('heat-admin') }}
                         ansible_host: {{ hostvars.raw_get(host)['ansible_host'] | default(host) | lower }}
                         canonical_hostname: {{ hostvars.raw_get(host)['canonical_hostname'] | default(host) | lower }}
@@ -316,7 +316,7 @@ outputs:
                   Undercloud:
                     hosts:
                       {% for host in groups['Undercloud'] -%}
-                      {{ hostvars.raw_get(host)['ansible_hostname'] | lower}}:
+                      {{ hostvars.raw_get(host)['ansible_facts']['hostname'] | lower}}:
                         ansible_host: {{ hostvars.raw_get(host)['ansible_host'] | default(host) | lower }}
                         ansible_become: false
                         ansible_connection: local
diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml
index b28c798f59..09aa61e202 100644
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@@ -151,7 +151,7 @@ outputs:
                   - python2-openstackclient
                   - openssl
                 state: present
-              when: ansible_distribution_major_version is version(8, '<')
+              when: ansible_facts['distribution_major_version'] is version(8, '<')
 
             - name: Ensure packages required for configuring octavia are present for CentOS/RHEL 8
               package:
@@ -160,7 +160,7 @@ outputs:
                   - python3-openstackclient
                   - openssl
                 state: present
-              when: ansible_distribution_major_version is version(8, '>=')
+              when: ansible_facts['distribution_major_version'] is version(8, '>=')
           when: {get_param: EnablePackageInstall}
         - name: enable virt_sandbox_use_netlink for healthcheck
           seboolean:
diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
index 5f4512b06a..24ffe10453 100644
--- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
+++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
@@ -372,7 +372,7 @@ outputs:
         - name: Update ovn-dbs-bundle resource to use pcmklatest tag image if not used
           when:
             - step|int == 5
-            - ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower
+            - ovn_dbs_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower
           block:
             - name: Get the present image used by ovn-dbs-bundle
               shell: "pcs resource config ovn-dbs-bundle | grep -Eo 'image=[^ ]+' | awk -F= '{print $2;}'"
@@ -436,7 +436,7 @@ outputs:
         - name: Update ovn_dbs pcs resource bundle for new container image
           when:
             - step|int == 1
-            - ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower
+            - ovn_dbs_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower
             - ovn_dbs_pcs_res|bool
             - ovn_dbs_image_current != ovn_dbs_image_latest
           block:
@@ -518,7 +518,7 @@ outputs:
         - name: Restart ovn-dbs service (pacemaker)
           when:
             - step|int == 1
-            - ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower
+            - ovn_dbs_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower
           pacemaker_resource:
             resource: ovn-dbs-bundle
             state: restart
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
index a88e14412d..a7446c4399 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@@ -346,7 +346,7 @@ outputs:
               set_fact:
                 rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result.rc == 0}}"
             - name: set is_notify_rabbitmq_bootstrap_node fact
-              set_fact: is_notify_rabbitmq_bootstrap_node={{oslo_messaging_notify_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_notify_rabbitmq_bootstrap_node={{oslo_messaging_notify_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}
         - name: Update rabbitmq-bundle pcs resource bundle for new container image
           when:
             - step|int == 1
diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
index 96113b1ba6..5e7a66cd14 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@@ -347,7 +347,7 @@ outputs:
                 rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result.rc == 0}}"
             - name: set is_rabbitmq_bootstrap_node fact
               tags: common
-              set_fact: is_rabbitmq_bootstrap_node={{rabbitmq_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_rabbitmq_bootstrap_node={{rabbitmq_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}
         - name: Update rabbitmq-bundle pcs resource bundle for new container image
           when:
             - step|int == 1
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
index a703fbab10..f7c1ba1910 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@@ -352,7 +352,7 @@ outputs:
               set_fact:
                 rabbitmq_pcs_res: "{{rabbitmq_pcs_res_result.rc == 0}}"
             - name: set is_rpc_rabbitmq_bootstrap_node fact
-              set_fact: is_rpc_rabbitmq_bootstrap_node={{oslo_messaging_rpc_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_rpc_rabbitmq_bootstrap_node={{oslo_messaging_rpc_short_bootstrap_node_name|lower == ansible_facts['hostname']|lower}}
         - name: Update rabbitmq-bundle pcs resource bundle for new container image
           when:
             - step|int == 1
diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml
index d1c23bf791..d50436cfac 100644
--- a/deployment/swift/swift-storage-container-puppet.yaml
+++ b/deployment/swift/swift-storage-container-puppet.yaml
@@ -627,11 +627,12 @@ outputs:
             gather_subset:
               - '!all'
               - 'hardware'
+            filter: 'ansible_device_links'
           when: swift_raw_disks
         - name: Mount devices defined in SwiftRawDisks
           mount:
             name: /srv/node/{{ item }}
-            src: "{% if lsblk.results['uuids'][item] is defined %}UUID={{ ansible_device_links['uuids'][item][0] }}{% else %}{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}{% endif %}"
+            src: "{% if lsblk.results['uuids'][item] is defined %}UUID={{ ansible_facts['device_links']['uuids'][item][0] }}{% else %}{{ swift_raw_disks[item]['base_dir']|default('/dev') }}/{{ item }}{% endif %}"
             fstype: xfs
             opts: noatime
             state: mounted
diff --git a/deployment/tls/undercloud-tls.yaml b/deployment/tls/undercloud-tls.yaml
index b2d2cee2ce..5d2c08fefa 100644
--- a/deployment/tls/undercloud-tls.yaml
+++ b/deployment/tls/undercloud-tls.yaml
@@ -50,8 +50,8 @@ outputs:
         # openssl-perl is installed which provides /etc/pki/CA on RHEL8
         - name: Ensure openssl-perl package is present on RHEL8
           when:
-            - ansible_os_family == 'RedHat'
-            - ansible_distribution_major_version == '8'
+            - ansible_facts['os_family'] == 'RedHat'
+            - ansible_facts['distribution_major_version'] is version('8', '==')
           package:
             name: openssl-perl
             state: present
@@ -75,7 +75,7 @@ outputs:
           when: ipa_otp != ''
         - name: Set keytab permission facts
           set_fact:
-            nova_service: "nova/{{ ansible_nodename }}"
+            nova_service: "nova/{{ ansible_facts['nodename'] }}"
             nova_keytab: "/etc/novajoin/krb5.keytab"
             nova_keytab_group: "tripleo-admin"
         - name: Add directory for keytab
diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index fee0a32954..181d901ad0 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -258,7 +258,7 @@ outputs:
                 state: present
               loop: "{{ dnf_module_list|list }}"
               when:
-                - ansible_distribution_major_version >= '8'
+                - ansible_facts['distribution_major_version'] is version('8', '>=')
                 - dnf_module_list|length > 0
             - name: Ensure TripleO prerequisite packages are installed
               package:
@@ -272,7 +272,7 @@ outputs:
                   - python3-heat-agent*
                   - rsync
                 state: present
-              when: ansible_distribution_major_version == '8'
+              when: ansible_facts['distribution_major_version'] is version('8', '==')
         - name: Special treatment for OpenvSwitch
           tripleo_ovs_upgrade:
           when:
@@ -347,7 +347,7 @@ outputs:
             skip_rhel_enforcement: {get_param: SkipRhelEnforcement}
           when:
             - step|int == 0
-            - ansible_distribution == 'RedHat'
+            - ansible_facts['distribution'] == 'RedHat'
             - not (skip_rhel_enforcement | bool)
         - name: Ensure DNF modules have the right stream
           vars:
@@ -358,7 +358,7 @@ outputs:
           loop: "{{ dnf_module_list|list }}"
           when:
             - step|int == 0
-            - ansible_distribution_major_version >= '8'
+            - ansible_facts['distribution_major_version'] is version('8', '>=')
             - dnf_module_list|length > 0
         - name: Check for existing yum.pid
           stat:  path=/var/run/yum.pid
diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml
index 177ecc9245..572233d920 100644
--- a/deployment/undercloud/undercloud-upgrade.yaml
+++ b/deployment/undercloud/undercloud-upgrade.yaml
@@ -65,7 +65,7 @@ outputs:
             skip_rhel_enforcement: {get_param: SkipRhelEnforcement}
           when:
             - step|int == 0
-            - ansible_distribution == 'RedHat'
+            - ansible_facts['distribution'] == 'RedHat'
             - not (skip_rhel_enforcement | bool)
         - name: Ensure DNF modules have the right stream
           vars:
@@ -76,7 +76,7 @@ outputs:
           loop: "{{ dnf_module_list|list }}"
           when:
             - step|int == 0
-            - ansible_distribution_major_version >= '8'
+            - ansible_facts['distribution_major_version'] is version('8', '>=')
             - dnf_module_list|length > 0
         - name: Special treatment for OpenvSwitch
           tripleo_ovs_upgrade: