diff --git a/zaza/openstack/utilities/os_versions.py b/zaza/openstack/utilities/os_versions.py
index 7930d5f7d..9429f9a21 100644
--- a/zaza/openstack/utilities/os_versions.py
+++ b/zaza/openstack/utilities/os_versions.py
@@ -43,6 +43,8 @@
     ('lunar', 'antelope'),
     ('mantic', 'bobcat'),
     ('noble', 'caracal'),
+    ('noble', 'dalmatian'),
+    ('noble', 'epoxy'),
 ])
 
 
@@ -73,6 +75,8 @@
     ('2023.1', 'antelope'),
     ('2023.2', 'bobcat'),
     ('2024.1', 'caracal'),
+    ('2024.2', 'dalmatian'),
+    ('2025.1', 'epoxy'),
 ])
 
 OPENSTACK_RELEASES_PAIRS = [
@@ -90,6 +94,7 @@
     'kinetic_zed', 'jammy_antelope', 'lunar_antelope',
     'jammy_bobcat', 'mantic_bobcat',
     'jammy_caracal', 'noble_caracal',
+    'noble_dalmatian', 'noble_epoxy',
 ]
 
 SWIFT_CODENAMES = OrderedDict([
@@ -325,6 +330,8 @@
     'lunar',
     'mantic',
     'noble',
+    'oracular',
+    'plucky',
 )