diff --git a/zaza/openstack/charm_tests/octavia/setup.py b/zaza/openstack/charm_tests/octavia/setup.py
index 4f93097..55f8903 100644
--- a/zaza/openstack/charm_tests/octavia/setup.py
+++ b/zaza/openstack/charm_tests/octavia/setup.py
@@ -26,6 +26,12 @@ import zaza.openstack.utilities.openstack as openstack
 import zaza.openstack.configure.guest
 
 
+def ensure_lts_images():
+    """Ensure that bionic and focal images are available for the tests."""
+    glance_setup.add_lts_image(image_name='bionic', release='bionic')
+    glance_setup.add_lts_image(image_name='focal', release='focal')
+
+
 def add_amphora_image(image_url=None):
     """Add Octavia ``amphora`` test image to glance.
 
diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
index 5c7d46a..47cabf3 100644
--- a/zaza/openstack/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -72,7 +72,9 @@ CIRROS_RELEASE_URL = 'http://download.cirros-cloud.net/version/released'
 CIRROS_IMAGE_URL = 'http://download.cirros-cloud.net'
 UBUNTU_IMAGE_URLS = {
     'bionic': ('http://cloud-images.ubuntu.com/{release}/current/'
-               '{release}-server-cloudimg-{arch}.img')
+               '{release}-server-cloudimg-{arch}.img'),
+    'focal': ('http://cloud-images.ubuntu.com/{release}/current/'
+              '{release}-server-cloudimg-{arch}.img'),
 }
 
 CHARM_TYPES = {