diff --git a/doc/source/common/glossary.rst b/doc/source/common/glossary.rst
index c9ae4473..d50565ab 100644
--- a/doc/source/common/glossary.rst
+++ b/doc/source/common/glossary.rst
@@ -2770,12 +2770,18 @@ O
       alphabetical order: Austin, Bexar, Cactus, Diablo, Essex,
       Folsom, Grizzly, Havana, Icehouse, Juno, Kilo, Liberty,
       Mitaka, Newton, Ocata, Pike, Queens, Rocky, Stein,
-      and Train.
-      Code names are cities or counties near where the
-      corresponding OpenStack design summit took place. An
-      exception, called the Waldon exception, is granted to
-      elements of the state flag that sound especially cool. Code
-      names are chosen by popular vote.
+      Train, Ussuri, Victoria, and Wallaby.
+
+      Wallaby was the first code name choosen by a new policy: Code
+      names are choosen by the community following the alphabet, for
+      details see `release name criteria
+      <https://governance.openstack.org/tc/reference/release-naming.html#release-name-criteria>`__.
+
+      The Victoria name was the last name where code names are cities
+      or counties near where the corresponding OpenStack design summit
+      took place. An exception, called the Waldon exception, was
+      granted to elements of the state flag that sound especially
+      cool. Code names are chosen by popular vote.
 
    openSUSE
 
@@ -3698,12 +3704,6 @@ S
       Disk-based virtual memory used by operating systems to provide
       more memory than is actually available on the system.
 
-   swauth
-
-      An authentication and authorization service for Object Storage,
-      implemented through WSGI middleware; uses Object Storage itself as the
-      persistent backing store.
-
    swift
 
       Codename for OpenStack :term:`Object Storage service<Object
@@ -3826,7 +3826,7 @@ T
    Train
 
       The code name for the twentieth release of OpenStack. The
-      OpenStack Infrastructure Summit will take place in Denver,
+      OpenStack Infrastructure Summit took place in Denver,
       Colorado, US.
 
       Two Project Team Gathering meetings in Denver were held at a
@@ -3911,11 +3911,24 @@ U
 
       An OpenStack-supported hypervisor.
 
+   Ussuri
+
+      The code name for the twenty first release of OpenStack. The
+      OpenStack Infrastructure Summit took place in Shanghai, People's
+      Republic of China. The release is named after the Ussuri river.
+
 V
 ~
 
 .. glossary::
 
+   Victoria
+
+      The code name for the twenty second release of OpenStack. The
+      OpenStack Infrastructure Summit took place in Vancouver,
+      British Columbia, Canada. The release is named after Victoria,
+      the capital city of British Columbia.
+
    VIF UUID
 
       Unique ID assigned to each Networking VIF.
@@ -4103,6 +4116,12 @@ W
 
 .. glossary::
 
+   Wallaby
+
+      The code name for the twenty third release of OpenStack.
+      Wallabies are native to Australia, which at the start of this
+      naming period was experiencing unprecedented wild fires.
+
    Watcher
 
       Code name for the :term:`Infrastructure Optimization service