diff --git a/playbooks/roles/bifrost-keystone-install/defaults/dummy-defaults.yml b/playbooks/roles/bifrost-keystone-install/defaults/dummy-defaults.yml
deleted file mode 100644
index c1a20659d..000000000
--- a/playbooks/roles/bifrost-keystone-install/defaults/dummy-defaults.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# NOTE(cinerama) This file is intentionally left blank - do not
-# add variables here.
diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu.yml b/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu.yml
deleted file mode 100644
index 5002212df..000000000
--- a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Ubuntu.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-required_packages:
-  - mariadb-server
-  - python3-dev
-  - libffi-dev
-  - libxslt1-dev
-  - libssl-dev
-  - libxml2-dev
diff --git a/playbooks/roles/bifrost-keystone-install/tasks/main.yml b/playbooks/roles/bifrost-keystone-install/tasks/main.yml
index d6194ec4b..d6c893a09 100644
--- a/playbooks/roles/bifrost-keystone-install/tasks/main.yml
+++ b/playbooks/roles/bifrost-keystone-install/tasks/main.yml
@@ -11,27 +11,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-# NOTE(cinerama) dummy-defaults.yml is an empty defaults file. We use it
-# here to ensure that with_first_found won't fail should we not have
-# defaults for a particular distribution, version, etc.
-- name: Include OS family-specific defaults
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "../defaults/required_defaults_{{ ansible_os_family }}_family.yml"
-    - "../defaults/dummy-defaults.yml"
-
-- name: Include OS distribution-specific defaults
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "../defaults/required_defaults_{{ ansible_distribution }}.yml"
-    - "../defaults/dummy-defaults.yml"
-
-- name: Include OS version-specific defaults
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "../defaults/required_defaults_{{ ansible_distribution }}_{{ ansible_distribution_release }}.yml"
-    - "../defaults/required_defaults_{{ ansible_distribution }}_{{ ansible_distribution_version }}.yml"
-    - "../defaults/dummy-defaults.yml"
+- name: Gather variables for each operating system
+  include_vars: "{{ lookup('first_found', params) }}"
+  vars:
+    params:
+      files:
+        - "{{ 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 }}.yml"
+      paths:
+        - "{{ role_path }}/vars"
 
 - name: "Install Keystone"
   include_tasks: install.yml
diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml b/playbooks/roles/bifrost-keystone-install/vars/debian.yml
similarity index 100%
rename from playbooks/roles/bifrost-keystone-install/defaults/required_defaults_Debian_family.yml
rename to playbooks/roles/bifrost-keystone-install/vars/debian.yml
diff --git a/playbooks/roles/bifrost-keystone-install/defaults/required_defaults_RedHat_family.yml b/playbooks/roles/bifrost-keystone-install/vars/redhat.yml
similarity index 100%
rename from playbooks/roles/bifrost-keystone-install/defaults/required_defaults_RedHat_family.yml
rename to playbooks/roles/bifrost-keystone-install/vars/redhat.yml