diff --git a/doc/source/project/release-schedule.rst b/doc/source/project/release-schedule.rst
index f11decf4..8c2188aa 100644
--- a/doc/source/project/release-schedule.rst
+++ b/doc/source/project/release-schedule.rst
@@ -24,14 +24,14 @@ latter dates are estimated and subject to revision.
      - Release date
      - Release timeline
 
-   * - 22.04
-     - under development
+   * - Yoga
+     - current stable
      - --
-     - Wed, Apr 21, 2022 (estimated)
+     - Thu, May 5, 2022
      - --
 
    * - 21.10
-     - current stable
+     - --
      - Fri, Oct 1, 2021
      - Wed, Oct 20, 2021
      - :doc:`release-timeline-2110`
diff --git a/doc/source/release-notes/index.rst b/doc/source/release-notes/index.rst
index e6ec9ac7..36a1cb57 100644
--- a/doc/source/release-notes/index.rst
+++ b/doc/source/release-notes/index.rst
@@ -7,27 +7,24 @@ This page lists the Release Notes for every version of OpenStack Charms.
 .. note::
 
    The version naming scheme for OpenStack Charms releases has changed from
-   being time-based (YY/MM) to one that uses the name of the newly-supported
+   being time-based (YY.MM) to one that uses the name of the newly-supported
    OpenStack release. See :doc:`Charm delivery <../project/charm-delivery>` for
    details.
 
-Under development:
-
-* :doc:`2204`
-
 Latest stable:
 
-* :doc:`2110`
+* :doc:`yoga`
 * :doc:`2106_Trilio`
 
 Older versions listed by year of release:
 
 .. list-table::
    :header-rows: 0
-   :widths: 20 20 40 20
+   :widths: 20 20 20 40 20
    :stub-columns: 1
 
    * - 2021
+     - :doc:`2110`
      - :doc:`2101`
      - :doc:`2103_Trilio`
      - :doc:`2104`
@@ -109,7 +106,7 @@ Older versions listed by year of release:
    :maxdepth: 1
    :hidden:
 
-   2204
+   yoga
    2110
    2104
    2106_Trilio
diff --git a/doc/source/release-notes/2204.rst b/doc/source/release-notes/yoga.rst
similarity index 98%
rename from doc/source/release-notes/2204.rst
rename to doc/source/release-notes/yoga.rst
index 66bf7791..d78bd8fc 100644
--- a/doc/source/release-notes/2204.rst
+++ b/doc/source/release-notes/yoga.rst
@@ -1,8 +1,8 @@
-=================================
-22.04 (Draft version in progress)
-=================================
+====
+Yoga
+====
 
-The 22.04 OpenStack Charms release includes updates for the charms described on
+The Yoga OpenStack Charms release includes updates for the charms described on
 the :doc:`../project/openstack-charms` page. As of this release, the project
 consists of 62 stable charms.