diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml
index 78a934dfe1..ad6073a794 100644
--- a/playbooks/openstack-hosts-setup.yml
+++ b/playbooks/openstack-hosts-setup.yml
@@ -45,9 +45,10 @@
       assert:
         that:
           - (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or
+            (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic') or
             (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') or
             (ansible_os_family == 'Suse' and ansible_distribution_major_version == '42')
-        msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), CentOS 7 (WIP) and openSUSE Leap 42.X (WIP)"
+        msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic),  CentOS 7 (WIP) and openSUSE Leap 42.X (WIP)"
 
     - include: common-tasks/package-cache-proxy.yml
       when: install_method == "source"
diff --git a/tests/roles/bootstrap-host/tasks/check-requirements.yml b/tests/roles/bootstrap-host/tasks/check-requirements.yml
index 09811bd744..8bf577a09f 100644
--- a/tests/roles/bootstrap-host/tasks/check-requirements.yml
+++ b/tests/roles/bootstrap-host/tasks/check-requirements.yml
@@ -17,9 +17,10 @@
   assert:
     that:
       - (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'xenial') or
+        (ansible_distribution == 'Ubuntu' and ansible_distribution_release == 'bionic') or
         (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7') or
         (ansible_os_family == 'Suse' and ansible_distribution_major_version == '42')
-    msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), CentOS 7 (WIP) and openSUSE Leap 42.X (WIP)"
+    msg: "The only supported platforms for this release are Ubuntu 16.04 LTS (Xenial), Ubuntu 18.04 LTS (Bionic), CentOS 7 (WIP) and openSUSE Leap 42.X (WIP)"
   when: (check_operating_system | default(True))| bool
   tags:
     - check-operating-system
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index a28fae7484..ab4b262798 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -38,6 +38,12 @@
       install_method: source
 
 # Ensuring overrides work
+- job:
+    name: openstack-ansible-varstest-aio_lxc-ubuntu-bionic
+    parent: openstack-ansible-deploy-aio_lxc-ubuntu-bionic
+    vars:
+      action: varstest
+
 - job:
     name: openstack-ansible-varstest-aio_lxc-ubuntu-xenial
     parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
@@ -69,6 +75,11 @@
       ansible_package: "file://{{ ansible_user_dir }}/src/github.com/ansible/ansible"
 
 # ubuntu
+- job:
+    name: openstack-ansible-deploy-aio_lxc-ubuntu-bionic
+    parent: openstack-ansible-deploy-aio
+    nodeset: ubuntu-bionic
+
 - job:
     name: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
     parent: openstack-ansible-deploy-aio
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 19d7aae8bc..e303f86550 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -33,6 +33,9 @@
         #- openstack-ansible-deploy-aio_lxc-centos-7
         #- openstack-ansible-deploy-aio_lxc-opensuse-423
         - openstack-ansible-deploy-aio_lxc-ubuntu-xenial
+        # NOTE(jrosser): Temporarily mark Bionic as non-voting until other bionic work is complete
+        - openstack-ansible-deploy-aio_lxc-ubuntu-bionic:
+            voting: false
         - openstack-ansible-deploy-aio_metal-ubuntu-xenial
         - openstack-ansible-deploy-aio_metal-opensuse-423
         - openstack-ansible-deploy-aio_metal-centos-7