diff --git a/deploy-guide/source/deploymenthost.rst b/deploy-guide/source/deploymenthost.rst
index 7d44d19ca1..c79cd8696d 100644
--- a/deploy-guide/source/deploymenthost.rst
+++ b/deploy-guide/source/deploymenthost.rst
@@ -27,6 +27,7 @@ Install one of the following supported operating systems on the deployment
 hosts:
 
 * `Ubuntu server 16.04 (Xenial Xerus) LTS 64-bit <http://releases.ubuntu.com/16.04/>`_
+* `Ubuntu server 18.04 (Bionic Beaver) LTS 64-bit <http://releases.ubuntu.com/18.04/>`_
 * `Centos 7 64-bit <https://www.centos.org/download/>`_
 * `openSUSE 42.X 64-bit <https://software.opensuse.org/distributions/leap>`_
 
diff --git a/deploy-guide/source/overview-requirements.rst b/deploy-guide/source/overview-requirements.rst
index 512880a9f9..6b240f8acc 100644
--- a/deploy-guide/source/overview-requirements.rst
+++ b/deploy-guide/source/overview-requirements.rst
@@ -6,7 +6,7 @@ following minimum requirements:
 
 * Ubuntu
 
-  * Ubuntu 16.04 LTS (Xenial Xerus)
+  * Ubuntu 16.04 LTS (Xenial Xerus) or Ubuntu 18.04 LTS (Bionic Beaver)
 
   * Linux kernel version ``3.13.0-34-generic`` or later is required.
 
diff --git a/deploy-guide/source/targethosts-prepare.rst b/deploy-guide/source/targethosts-prepare.rst
index a7864ee65f..63cde9bd5a 100644
--- a/deploy-guide/source/targethosts-prepare.rst
+++ b/deploy-guide/source/targethosts-prepare.rst
@@ -12,6 +12,7 @@ Install one of the following supported operating systems on the
 target host:
 
 * Ubuntu server 16.04 (Xenial Xerus) LTS 64-bit
+* Ubuntu server 18.04 (Bionic Beaver) LTS 64-bit
 * Centos 7 64-bit
 * openSUSE 42.X 64-bit
 
diff --git a/doc/source/user/aio/quickstart.rst b/doc/source/user/aio/quickstart.rst
index c0e82a0aab..5452963240 100644
--- a/doc/source/user/aio/quickstart.rst
+++ b/doc/source/user/aio/quickstart.rst
@@ -109,7 +109,8 @@ version.
 
 .. note::
    The |current_release_formal_name| release is only compatible with Ubuntu
-   16.04 (Xenial Xerus), Centos 7 and openSUSE Leap 42.X.
+   16.04 (Xenial Xerus), Ubuntu 18.04 (Bionic Beaver) Centos 7 and
+   openSUSE Leap 42.X.
 
 By default the scripts deploy all OpenStack services with sensible defaults
 for the purpose of a gate check, development or testing system.
diff --git a/doc/source/user/limited-connectivity/index.rst b/doc/source/user/limited-connectivity/index.rst
index fa46def2ba..fba5a509b0 100644
--- a/doc/source/user/limited-connectivity/index.rst
+++ b/doc/source/user/limited-connectivity/index.rst
@@ -63,11 +63,16 @@ Many software packages are installed on Ubuntu hosts using `.deb` packages.
 Similar packaging mechanisms exist for other Linux distributions. We advise
 mirroring the repositories that host these packages.
 
-Upstream Ubuntu repositories to mirror:
+Upstream Ubuntu repositories to mirror for Ubuntu 16.04 LTS:
 
 - xenial
 - xenial-updates
 
+Upstream Ubuntu repositories to mirror for Ubuntu 18.04 LTS:
+
+- bionic
+- bionic-updates
+
 OpenStack-Ansible requires several other repositories to install specific
 components such as Galera and Ceph.
 
diff --git a/releasenotes/notes/add-bionic-support-999217a9f7f213cc.yaml b/releasenotes/notes/add-bionic-support-999217a9f7f213cc.yaml
new file mode 100644
index 0000000000..583d85b638
--- /dev/null
+++ b/releasenotes/notes/add-bionic-support-999217a9f7f213cc.yaml
@@ -0,0 +1,13 @@
+---
+features:
+  - Support has been added for deploying on Ubuntu 18.04 LTS hosts.
+    The most significant change is a major version increment of LXC
+    from 2.x to 3.x which deprecates some previously used elements
+    of the container configuration file.
+upgrade:
+  - The supported upgrade path from Xenial to Bionic is via
+    re-installation of the host OS across all nodes and redeployment
+    of the required services. The Rocky branch of OSA is intended
+    as the transition point for such upgrades from Xenial to Bionic.
+    At this time there is no support for in-place operating system
+    upgrades (typically via ``do-release-upgrade``).
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index fa38dc2693..151b4fc579 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -43,14 +43,13 @@
       jobs:
         # - openstack-ansible-deploy-aio_lxc-centos-7
         # - openstack-ansible-deploy-aio_lxc-opensuse-423
-        - openstack-ansible-deploy-aio_lxc-ubuntu-bionic:
-            voting: false
+        - openstack-ansible-deploy-aio_lxc-ubuntu-bionic
         - openstack-ansible-deploy-aio_lxc-ubuntu-xenial
     gate:
       jobs:
         # - openstack-ansible-deploy-aio_lxc-centos-7
         # - openstack-ansible-deploy-aio_lxc-opensuse-423
-        # - openstack-ansible-deploy-aio_lxc-ubuntu-bionic
+        - openstack-ansible-deploy-aio_lxc-ubuntu-bionic
         - openstack-ansible-deploy-aio_lxc-ubuntu-xenial
     periodic:
       jobs: