diff --git a/ISSUES.md b/ISSUES.md
deleted file mode 100644
index 50f903c..0000000
--- a/ISSUES.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Issues Addressed
-
-| Vendor | Version | Issue |
-| ------ | ------- | ----- |
-| Alma   | 8-10    | Ensure SELinux Python bindings are present |
-| CentOS | 6       | Ensure ACPI Daemon is both running and present so that OS will respond to physical or virtual ACPI events |
-| CentOS | 6       | Ensure Python OpenSSL support is updated to handle newer TLS features |
-| CentOS | 6-10    | Ensure SELinux Python bindings are present |
-| Debian | All     | Ensure apt does not reference non-present CDROM media |
-| Debian | All     | Ensure sudo is present |
-| Fedora | 30-44   | Ensure SELinux Python bindings are present |
-| Oracle | 8-10    | Ensure SELinux Python bindings are present |
-| Rocky  | 8-10    | Ensure SELinux Python bindings are present |
diff --git a/tasks/main.yml b/tasks/main.yml
index a9a5d4f..c8aaa89 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -8,12 +8,12 @@
   vars:
     findme:
       files:
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml'
-        - '{{ ansible_distribution }}-default.yml'
-        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
-        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml'
-        - '{{ ansible_os_family }}-default.yml'
+        - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
+        - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
+        - '{{ ansible_facts["distribution"] }}-default.yml'
+        - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
+        - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
+        - '{{ ansible_facts["os_family"]}}-default.yml'
         - 'default.yml'
       errors: 'ignore'
 - name: 'include vendor / version specific variables'
@@ -25,12 +25,12 @@
   vars:
     findme:
       files:
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
-        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-default.yml'
-        - '{{ ansible_distribution }}-default.yml'
-        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}.yml'
-        - '{{ ansible_os_family }}-{{ ansible_distribution_major_version }}-default.yml'
-        - '{{ ansible_os_family }}-default.yml'
+        - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
+        - '{{ ansible_facts["distribution"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
+        - '{{ ansible_facts["distribution"] }}-default.yml'
+        - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-{{ ansible_facts["architecture"] }}.yml'
+        - '{{ ansible_facts["os_family"] }}-{{ ansible_facts["distribution_major_version"] }}-default.yml'
+        - '{{ ansible_facts["os_family"] }}-default.yml'
         - 'default.yml'
       paths:
         - '../vars/'