diff --git a/unit_tests/utilities/test_zaza_utilities_openstack.py b/unit_tests/utilities/test_zaza_utilities_openstack.py
index 3184166..190437b 100644
--- a/unit_tests/utilities/test_zaza_utilities_openstack.py
+++ b/unit_tests/utilities/test_zaza_utilities_openstack.py
@@ -373,6 +373,10 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
             openstack_utils.find_ubuntu_image('bionic', 'aarch64'),
             ('http://cloud-images.ubuntu.com/bionic/current/'
              'bionic-server-cloudimg-aarch64.img'))
+        self.assertEqual(
+            openstack_utils.find_ubuntu_image('jammy', 'amd64'),
+            ('http://cloud-images.ubuntu.com/jammy/current/'
+             'jammy-server-cloudimg-amd64.img'))
 
     def test_download_image(self):
         urllib_opener_mock = mock.MagicMock()
diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
index 1bd56c1..d9eb9bf 100644
--- a/zaza/openstack/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -91,6 +91,8 @@ UBUNTU_IMAGE_URLS = {
                '{release}-server-cloudimg-{arch}.img'),
     'focal': ('http://cloud-images.ubuntu.com/{release}/current/'
               '{release}-server-cloudimg-{arch}.img'),
+    'default': ('http://cloud-images.ubuntu.com/{release}/current/'
+                '{release}-server-cloudimg-{arch}.img'),
 }
 
 CHARM_TYPES = {
@@ -2299,7 +2301,8 @@ def find_cirros_image(arch):
 
 def find_ubuntu_image(release, arch):
     """Return url for image."""
-    return UBUNTU_IMAGE_URLS[release].format(release=release, arch=arch)
+    loc_str = UBUNTU_IMAGE_URLS.get(release) or UBUNTU_IMAGE_URLS['default']
+    return loc_str.format(release=release, arch=arch)
 
 
 def download_image(image_url, target_file):