diff --git a/vars/ubuntu-18.04.yml b/vars/ubuntu-18.04.yml
deleted file mode 100644
index d4249fa..0000000
--- a/vars/ubuntu-18.04.yml
+++ /dev/null
@@ -1,42 +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.
-
-## APT Cache options
-cache_timeout: 600
-
-repo_build_distro_packages:
-  - build-essential
-  - cmake
-  - git
-  - liberasurecode-dev      # required to build pyeclib
-  - libffi-dev              # required to build xattr
-  - libjpeg-dev             # required to build pillow
-  - libkrb5-dev             # required to build pykerberos
-  - libldap2-dev            # required to build python-ldap
-  - libmariadbclient-dev    # required to build MySQL-python
-  - libpcre3-dev            # required to build uwsgi
-  - libpq-dev               # required to build psycopg2
-  - librados-dev            # required to build cradox
-  - libsasl2-dev            # required to build python-ldap
-  - libsqlite3-dev          # required to build pysqlite
-  - libssl-dev              # required to build cryptography
-  - libvirt-dev             # required to build libvirt-python
-  - libxslt1-dev            # required to build lxml
-  - libxml2-dev             # required to build lxml
-  - libsystemd-dev          # required to build systemd-python
-  - moreutils               # provides `ts` command to timestamp pip logs
-  - pkg-config
-  - python-dev
-  - swig
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