diff --git a/Vagrantfile b/Vagrantfile
index 4468b89b..2a83de46 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -39,11 +39,6 @@ Vagrant.configure(2) do |config|
     debian10.vm.box = "debian/buster64"
   end
 
-  config.vm.define "ubuntu1804" do |bionic|
-    bionic.disksize.size = "40GB"
-    bionic.vm.box = "ubuntu/bionic64"
-  end
-
   config.vm.define "ubuntu2004" do |focal|
     focal.disksize.size = "40GB"
     focal.vm.box = "ubuntu/focal64"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 4ee2b8e0..ef7cad6f 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -124,60 +124,16 @@
     vars:
       tox_env: upgrade
 
-- job:
-    name: openstack-ansible-functional-debian-buster
-    parent: openstack-ansible-functional
-    nodeset: debian-buster
-    voting: false
-
-- job:
-    name: openstack-ansible-functional-ubuntu-bionic
-    parent: openstack-ansible-functional
-    nodeset: ubuntu-bionic
-
 - job:
     name: openstack-ansible-functional-ubuntu-focal
     parent: openstack-ansible-functional
     nodeset: ubuntu-focal
 
-- job:
-    name: openstack-ansible-upgrade-ubuntu-bionic
-    parent: openstack-ansible-upgrade
-    nodeset: ubuntu-bionic
-
-- 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-gentoo-17-0-systemd
-    parent: openstack-ansible-upgrade
-    nodeset: gentoo-17-0-systemd
-
-- job:
-    name: openstack-ansible-functional-gentoo-17-0-systemd
-    parent: openstack-ansible-functional
-    nodeset: gentoo-17-0-systemd
-
-- job:
-    name: openstack-ansible-functional-distro_install-gentoo-17-0-systemd
-    parent: openstack-ansible-functional
-    nodeset: gentoo-17-0-systemd
-    vars:
-      tox_env: distro_install
-
 - job:
     name: openstack-ansible-functional-centos-8
     parent: openstack-ansible-functional
     nodeset: centos-8
 
-- job:
-    name: openstack-ansible-upgrade-centos-8
-    parent: openstack-ansible-upgrade
-    nodeset: centos-8
-
 - job:
     name: openstack-ansible-functional-distro_install-centos-8
     parent: openstack-ansible-functional
@@ -196,27 +152,3 @@
       to execute the tests from must be specified in the
       ``osa_test_repo`` variable.
     nodeset: ubuntu-bionic
-
-- job:
-    name: openstack-ansible-integrated-deploy-aio
-    parent: openstack-ansible-deploy-aio
-    nodeset: ubuntu-bionic
-    voting: false
-    required-projects:
-      - openstack/openstack-ansible
-    description: |
-      Run AIO tests for an OpenStack-Ansible project.
-      This uses the integrated repository openstack-ansible
-      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.
-    vars:
-      osa_test_repo: "openstack/openstack-ansible"
-
-- job:
-    name: openstack-ansible-integrated-deploy-ceph
-    parent: openstack-ansible-integrated-deploy-aio
-    voting: false
-    vars:
-      scenario: ceph
diff --git a/zuul.d/playbooks/pre-gate-cleanup.yml b/zuul.d/playbooks/pre-gate-cleanup.yml
index 8462c211..afc270f9 100644
--- a/zuul.d/playbooks/pre-gate-cleanup.yml
+++ b/zuul.d/playbooks/pre-gate-cleanup.yml
@@ -24,7 +24,7 @@
         regexp: 'https'
         replace: "http"
       when:
-        - ansible_facts['distribution_release'] in ['bionic', 'focal']
+        - ansible_facts['distribution_release'] in ['focal']
 
     - name: Remove package blacklist for dnf
       lineinfile:
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index 6f9562d7..d1aadc7e 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -14,7 +14,6 @@
       jobs:
         - openstack-ansible-functional-debian-buster
         - openstack-ansible-functional-centos-8
-        - openstack-ansible-functional-ubuntu-bionic
         - openstack-ansible-functional-ubuntu-focal
     gate:
       jobs: