diff --git a/charms_ceph/utils.py b/charms_ceph/utils.py
index e525875..efe5ab8 100644
--- a/charms_ceph/utils.py
+++ b/charms_ceph/utils.py
@@ -2900,6 +2900,7 @@ UPGRADE_PATHS = collections.OrderedDict([
     ('jewel', 'luminous'),
     ('luminous', 'mimic'),
     ('mimic', 'nautilus'),
+    ('nautilus', 'octopus'),
 ])
 
 # Map UCA codenames to ceph codenames
@@ -2916,6 +2917,7 @@ UCA_CODENAME_MAP = {
     'rocky': 'mimic',
     'stein': 'mimic',
     'train': 'nautilus',
+    'ussuri': 'octopus',
 }
 
 
diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index 960bc3c..4be327b 100644
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -946,6 +946,7 @@ class CephTestCase(unittest.TestCase):
             'jewel -> luminous',
             'luminous -> mimic',
             'mimic -> nautilus',
+            'nautilus -> octopus',
         ])
         self.assertEqual(utils.pretty_print_upgrade_paths(), expected)