diff --git a/tasks/main.yaml b/tasks/main.yaml
index d10a6a5..5c4c078 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -2,8 +2,8 @@
 - name: Certbot - Get OS specific vars
   include_vars: "{{ item }}"
   with_first_found:
-    - "os/{{ ansible_os_family }}/{{ ansible_distribution_major_version }}.yaml"
-    - "os/{{ ansible_os_family }}.yaml"
+    - "os/{{ ansible_facts['os_family'] }}/{{ ansible_facts['distribution_major_version'] }}.yaml"
+    - "os/{{ ansible_facts['os_family'] }}.yaml"
 
 - name: Certbot - Install Certbot
   ansible.builtin.import_tasks: install.yaml
diff --git a/tasks/request_certs.yaml b/tasks/request_certs.yaml
index 4accab2..e3e8504 100644
--- a/tasks/request_certs.yaml
+++ b/tasks/request_certs.yaml
@@ -1,10 +1,10 @@
 ---
 - name: Certbot - Add host FQDN if not already listed in certs
   ansible.builtin.set_fact:
-    certbot_certs: "{{ certbot_certs + [{'hostname': ansible_fqdn}] }}"
+    certbot_certs: "{{ certbot_certs + [{'hostname': ansible_facts['fqdn']}] }}"
   when:
     - certbot_request_fqdn_cert
-    - certbot_certs | selectattr('hostname', 'equalto', ansible_fqdn) | list | length == 0
+    - certbot_certs | selectattr('hostname', 'equalto', ansible_facts['fqdn']) | list | length == 0
 
 - name: Certbot - Request Certificate
   ansible.builtin.include_tasks: cert.yaml