diff --git a/local.yml b/local.yml
index 5093312..7be7b1c 100644
--- a/local.yml
+++ b/local.yml
@@ -21,7 +21,7 @@
       ansible.builtin.meta: end_play
       when:
         - marker_file_stat.stat.exists
-        - (ansible_date_time.epoch | int) - (marker_file_stat.stat.mtime | int) < (ansible_reboot_cooldown_minutes | int * 60)
+        - (ansible_facts['date_time']['epoch'] | int) - (marker_file_stat.stat.mtime | int) < (ansible_reboot_cooldown_minutes | int * 60)
       tags: always
 
     - name: pre-run | set marker file path as a cached fact
diff --git a/roles/backup/tasks/software/packages_utilities.yml b/roles/backup/tasks/software/packages_utilities.yml
index df5091d..ce6e7a5 100644
--- a/roles/backup/tasks/software/packages_utilities.yml
+++ b/roles/backup/tasks/software/packages_utilities.yml
@@ -41,7 +41,7 @@
 - name: backup | tailscale | add tailscale apt key (debian-based)
   tags: packages,system,system setup,tailscale
   get_url:
-    url: "https://pkgs.tailscale.com/stable/{{ ansible_facts['distribution'] | lower }}/{{ ansible_facts['distribution']_release }}.noarmor.gpg"
+    url: "https://pkgs.tailscale.com/stable/{{ ansible_facts['distribution'] | lower }}/{{ ansible_facts['distribution_release'] }}.noarmor.gpg"
     dest: /usr/share/keyrings/tailscale-archive-keyring.gpg
     mode: '0644'
   when: ansible_facts['distribution'] in [ "Debian", "Ubuntu", "Linux Mint" ]
@@ -49,7 +49,7 @@
 - name: backup | tailscale | add tailscale repository (debian-based)
   tags: packages,system,system setup,tailscale
   apt_repository:
-    repo: "deb [signed-by=/usr/share/keyrings/tailscale-archive-keyring.gpg] https://pkgs.tailscale.com/stable/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution']_release }} main"
+    repo: "deb [signed-by=/usr/share/keyrings/tailscale-archive-keyring.gpg] https://pkgs.tailscale.com/stable/{{ ansible_facts['distribution'] | lower }} {{ ansible_facts['distribution_release'] }} main"
     state: present
     filename: tailscale
   when: ansible_facts['distribution'] in [ "Debian", "Ubuntu", "Linux Mint" ]
diff --git a/roles/base/tasks/ansible_setup.yml b/roles/base/tasks/ansible_setup.yml
index 375c9c8..ff3c0b1 100644
--- a/roles/base/tasks/ansible_setup.yml
+++ b/roles/base/tasks/ansible_setup.yml
@@ -7,9 +7,9 @@
   when: ansible_facts['distribution'] in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"]
 
 - debug:
-    var: ansible_facts['distribution']_release
+    var: ansible_facts['distribution_release']
 - debug:
-    var: equivalents[ansible_facts['distribution']_release]['ubuntu']
+    var: equivalents[ansible_facts['distribution_release']]['ubuntu']
   when: ansible_facts['distribution'] in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"]
   
 
@@ -37,7 +37,7 @@
 - name: ansible setup | remove repository - Debian / Ubuntu
   tags: ansible,ansible-setup
   apt_repository:
-    repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ equivalents[ansible_facts['distribution']_release]['ubuntu'] }} main"
+    repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ equivalents[ansible_facts['distribution_release']]['ubuntu'] }} main"
     state: absent
     update_cache: no
     filename:  ansible
@@ -46,7 +46,7 @@
 - name: ansible setup | update repository - Debian
   tags: ansible,ansible-setup
   apt_repository:
-    repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ equivalents[ansible_facts['distribution']_release]['ubuntu'] }} main"
+    repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ equivalents[ansible_facts['distribution_release]['ubuntu'] }} main"
     state: present
     update_cache: yes 
     filename:  ansible
@@ -55,7 +55,7 @@
 - name: ansible setup | update repository - Ubuntu
   tags: ansible,ansible-setup
   apt_repository:
-    repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ ansible_facts['distribution']_release }} main"
+    repo: "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu {{ ansible_facts['distribution_release'] }} main"
     state: present
     update_cache: yes 
     filename:  ansible
diff --git a/roles/base/tasks/software/packages_utilities.yml b/roles/base/tasks/software/packages_utilities.yml
index 42c32d0..31a1cc9 100644
--- a/roles/base/tasks/software/packages_utilities.yml
+++ b/roles/base/tasks/software/packages_utilities.yml
@@ -40,8 +40,8 @@
     - qemu-guest-agent
     - virt-what
   when:
-    - ansible_virtualization_role == "guest"
-    - ansible_virtualization_type == "kvm"
+    - ansible_facts['virtualization_role'] == "guest"
+    - ansible_facts['virtualization_type'] == "kvm"
   ignore_errors: true
 
 - name: system setup | utilities | install utilities (arch)
diff --git a/roles/server/tasks/system_setup/cron.yml b/roles/server/tasks/system_setup/cron.yml
index a24efa6..891aee8 100644
--- a/roles/server/tasks/system_setup/cron.yml
+++ b/roles/server/tasks/system_setup/cron.yml
@@ -14,8 +14,8 @@
     job: "{{ item.job }}"
     state: absent
   when:
-   - ansible_virtualization_role == "NA" or ansible_virtualization_role == "guest"
-   - ansible_virtualization_type == "kvm"
+   - ansible_facts['virtualization_role'] == "NA" or ansible_facts['virtualization_role'] == "guest"
+   - ansible_facts['virtualization_type'] == "kvm"
   loop:
     - { title: "Backup", job: "/root/bin/backup_vps.bash", hour: 1, minute: 0 }
 
@@ -28,7 +28,7 @@
     minute: "{{ item.minute }}"
     job: "{{ item.job }}"
     state: absent
-  when: ansible_virtualization_role != "guest" or ansible_virtualization_type != "kvm"
+  when: ansible_facts['virtualization_role'] != "guest" or ansible_facts['virtualization_type'] != "kvm"
   loop:
     - { title: "Backup", job: "/root/bin/backup_vps.bash", hour: 1, minute: 0 }
 
diff --git a/roles/webservers/tasks/apps/nextcloud/prereq.yml b/roles/webservers/tasks/apps/nextcloud/prereq.yml
index ac5d7a6..fbdcfa8 100644
--- a/roles/webservers/tasks/apps/nextcloud/prereq.yml
+++ b/roles/webservers/tasks/apps/nextcloud/prereq.yml
@@ -18,7 +18,7 @@
   ansible.builtin.lineinfile:
     path: "/etc/apt/sources.list.d/php.list"
     state: present
-    line: "deb https://packages.sury.org/php/ {{ ansible_facts['distribution']_release | lower }} main"
+    line: "deb https://packages.sury.org/php/ {{ ansible_facts['distribution_release'] | lower }} main"
     create: True
   
 - name: webservers | nextcloud | prereq | install php