diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
deleted file mode 100644
index 76f5a610..00000000
--- a/vars/ubuntu-18.04.yml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-# Copyright 2018, VEXXHOST, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-keystone_distro_packages:
-  - git
-  - python-keystoneclient # Keystoneclient needed to OSA keystone lib
-  - rsync
-
-keystone_devel_distro_packages:
-  - docutils-common
-  - libffi-dev
-  - libjs-sphinxdoc
-  - libjs-underscore
-  - libldap2-dev
-  - libsasl2-dev
-  - libsystemd-dev
-  - libxslt1.1
-  - libxslt1-dev
-  - libxml2-dev
-  - pkg-config
-  - python-dev
-
-keystone_service_distro_packages:
-  - keystone
-  - python-systemd
-  - python3-systemd
-  - uwsgi
-  - uwsgi-plugin-python
-
-keystone_apache_distro_packages:
-  - apache2
-  - apache2-utils
-  - libapache2-mod-proxy-uwsgi
-
-keystone_nginx_distro_packages:
-  - nginx-full
-
-keystone_idp_distro_packages:
-  - ssl-cert
-  - xmlsec1
-
-keystone_sp_distro_packages:
-  - libapache2-mod-shib2
-
-keystone_developer_mode_distro_packages:
-  - build-essential
-
-keystone_apache_default_sites:
-  - "/etc/apache2/sites-enabled/000-default.conf"
-
-keystone_apache_site_available: "/etc/apache2/sites-available/keystone-httpd.conf"
-keystone_apache_site_enabled: "/etc/apache2/sites-enabled/keystone-httpd.conf"
-keystone_apache_conf: "/etc/apache2/apache2.conf"
-keystone_apache_default_log_folder: "/var/log/apache2"
-keystone_apache_default_log_owner: "root"
-keystone_apache_default_log_grp: "adm"
-keystone_apache_security_conf: "/etc/apache2/conf-available/security.conf"
-
-keystone_apache_configs:
-  - { src: "keystone-ports.conf.j2", dest: "/etc/apache2/ports.conf" }
-  - { src: "keystone-httpd.conf.j2", dest: "/etc/apache2/sites-available/keystone-httpd.conf" }
-  - { src: "keystone-httpd-mpm.conf.j2", dest: "/etc/apache2/mods-available/mpm_{{ keystone_httpd_mpm_backend }}.conf" }
-
-keystone_apache_modules:
-  - name: "ssl"
-    state: "{{ (keystone_ssl | bool) | ternary('present', 'absent') }}"
-  - name: "shib2"
-    state: "{{ ( keystone_sp != {} ) | ternary('present', 'absent') }}"
-  - name: "proxy_http"
-    state: "present"
-  - name: "headers"
-    state: "present"
-# This can be enabled when Apache2.5+ is available
-#  - name: "mod_journald"
-#    state: "present
-
-keystone_nginx_conf_path: "sites-available"
-
-keystone_system_service_name: apache2
-
-keystone_uwsgi_bin: '/usr/bin'
diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu.yml
similarity index 100%
rename from vars/ubuntu-16.04.yml
rename to vars/ubuntu.yml