diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
deleted file mode 100644
index 8a9ebbd0..00000000
--- a/vars/ubuntu-18.04.yml
+++ /dev/null
@@ -1,100 +0,0 @@
----
-# Copyright 2016, Rackspace US, 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.
-
-## Defined required kernel
-openstack_host_required_kernel: 4.15.0-0-generic
-openstack_host_sysstat_file: /etc/default/sysstat
-openstack_host_sysstat_cron_file: /etc/cron.d/sysstat
-openstack_host_cron_template: sysstat.cron.debian.j2
-openstack_host_module_file: /etc/modules
-
-## Kernel modules loaded on hosts
-openstack_host_kernel_modules:
-  - name: 8021q
-  - name: br_netfilter
-  - name: dm_multipath
-  - name: dm_snapshot
-  - name: ebtables
-  - name: ip6table_filter
-  - name: ip6_tables
-  - name: ip_tables
-  - name: ipt_MASQUERADE
-  - name: ipt_REJECT
-  - name: iptable_filter
-  - name: iptable_mangle
-  - name: iptable_nat
-  - name: ip_vs
-  - name: iscsi_tcp
-  - name: nbd
-  - name: nf_conntrack
-  - name: nf_conntrack_ipv4
-  - name: nf_conntrack_ipv6
-  - name: nf_defrag_ipv4
-  - name: nf_nat
-  - name: nf_nat_ipv4
-  - name: vhost_net
-  - name: x_tables
-
-## Base packages
-_openstack_host_distro_packages:
-  - python-pip
-  - python3-pip
-  - python-setuptools
-  - python3-setuptools
-  - python-virtualenv
-  - python3-virtualenv
-  - python-wheel
-  - python3-wheel
-  - virtualenv
-
-## Bare metal base packages
-_openstack_host_metal_distro_packages:
-  - apparmor-utils
-  - apt-transport-https
-  - bridge-utils
-  - build-essential
-  - cgroup-lite
-  - curl
-  - dmeventd
-  - dstat
-  - ebtables
-  - htop
-  - iptables
-  - irqbalance
-  - libkmod-dev
-  - libkmod2
-  - lvm2
-  - python-dev
-  - rsync
-  - rsyslog
-  - software-properties-common
-  - sysstat
-  - time
-  - vlan
-  - wget
-
-_package_repos_keys: []
-## example:
-# - id:
-#   file:
-#   keyserver:
-#   url:
-#   state:
-
-# Bionic Rocky has no UCA
-_package_list: []
-
-# Bionic Rocky has no UCA.
-_package_repos: []
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