diff --git a/Vagrantfile b/Vagrantfile
index 7acf718d..bf2400c1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -51,13 +51,8 @@ Vagrant.configure(2) do |config|
     leap150.vm.box = "opensuse/openSUSE-15.0-x86_64"
   end
 
-  config.vm.define "opensuse151" do |leap150|
-    leap150.vm.box = "opensuse/openSUSE-15.1-x86_64"
-  end
-
-  config.vm.define "ubuntu1604" do |xenial|
-    xenial.disksize.size = "40GB"
-    xenial.vm.box = "ubuntu/xenial64"
+  config.vm.define "opensuse151" do |leap151|
+    leap151.vm.box = "opensuse/openSUSE-15.1-x86_64"
   end
 
   config.vm.define "ubuntu1804" do |bionic|
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index b02ae046..cf4bdee3 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -127,28 +127,11 @@
     parent: openstack-ansible-upgrade
     nodeset: ubuntu-bionic
 
-- job:
-    name: openstack-ansible-functional-ubuntu-xenial
-    parent: openstack-ansible-functional
-    nodeset: ubuntu-xenial
-
-- job:
-    name: openstack-ansible-functional-distro_install-ubuntu-xenial
-    parent: openstack-ansible-functional-ubuntu-xenial
-    vars:
-      tox_env: distro_install
-
 - job:
     name: openstack-ansible-functional-distro_install-ubuntu-bionic
     parent: openstack-ansible-functional-ubuntu-bionic
     vars:
       tox_env: distro_install
-
-- job:
-    name: openstack-ansible-upgrade-ubuntu-xenial
-    parent: openstack-ansible-upgrade
-    nodeset: ubuntu-xenial
-
 - job:
     name: openstack-ansible-upgrade-opensuse-15
     parent: openstack-ansible-upgrade
@@ -225,7 +208,7 @@
     description: |
       Run AIO tests for an OpenStack-Ansible project.
       This uses the integrated repository openstack-ansible
-      on Ubuntu Xenial with the scenario ``deploy`` ``aio``.
+      on Ubuntu Bionic with the scenario ``deploy`` ``aio``.
       Any project can then use
       the ``openstack-ansible-integrated-deploy-aio`` job in
       whatever pipeline is appropriate.
@@ -244,9 +227,3 @@
     parent: openstack-ansible-functional-ubuntu-bionic
     vars:
       tox_env: func_py3
-
-- job:
-    name: openstack-ansible-python3-ubuntu-xenial
-    parent: openstack-ansible-functional-ubuntu-xenial
-    vars:
-      tox_env: func_py3
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 9c2d01eb..4a2ea10e 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -33,14 +33,11 @@
     check:
       jobs:
         - openstack-ansible-upgrade-centos-7
-        # TODO(mnaser): Make this voting once we release Rocky
-        - openstack-ansible-upgrade-ubuntu-bionic:
-            voting: false
-        - openstack-ansible-upgrade-ubuntu-xenial
+        - openstack-ansible-upgrade-ubuntu-bionic
     gate:
       jobs:
         - openstack-ansible-upgrade-centos-7
-        - openstack-ansible-upgrade-ubuntu-xenial
+          openstack-ansible-upgrade-ubuntu-bionic
     experimental:
       jobs:
         - openstack-ansible-upgrade-opensuse-15