diff --git a/releasenotes/source/current-series.rst b/releasenotes/source/current-series.rst
deleted file mode 100644
index 875030f9d0..0000000000
--- a/releasenotes/source/current-series.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-============================
-Current Series Release Notes
-============================
-
-.. release-notes::
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 584d67f952..37ab0895bd 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -5,15 +5,11 @@
 .. toctree::
    :maxdepth: 1
 
-   Current (unreleased) <current-series>
-   Newton (6.0.0 - 6.2.x) <newton>
-   Mitaka (4.3.0 - 5.1.x) <mitaka>
-   Liberty (4.0.0 - 4.2.x) <liberty>
+   unreleased
+   ocata
+   newton
+   mitaka
+   liberty
    Kilo (2015.1) <https://wiki.openstack.org/wiki/Ironic/ReleaseNotes/Kilo>
    Juno (2014.2) <https://wiki.openstack.org/wiki/Ironic/ReleaseNotes/Juno>
    Icehouse (2014.1) <https://wiki.openstack.org/wiki/Ironic/ReleaseNotes/Icehouse>
-
-.. toctree::
-   :hidden:
-
-   unreleased
diff --git a/releasenotes/source/liberty.rst b/releasenotes/source/liberty.rst
index 80ae5f8ea1..00c3ba4180 100644
--- a/releasenotes/source/liberty.rst
+++ b/releasenotes/source/liberty.rst
@@ -1,6 +1,6 @@
-============================
-Liberty Series Release Notes
-============================
+============================================
+Liberty Series (4.0.0 - 4.2.x) Release Notes
+============================================
 
 .. release-notes::
    :branch: origin/stable/liberty
diff --git a/releasenotes/source/mitaka.rst b/releasenotes/source/mitaka.rst
index 05ed3e48eb..ff4620f0ee 100644
--- a/releasenotes/source/mitaka.rst
+++ b/releasenotes/source/mitaka.rst
@@ -1,6 +1,6 @@
-===========================
-Mitaka Series Release Notes
-===========================
+===========================================
+Mitaka Series (4.3.0 - 5.1.x) Release Notes
+===========================================
 
 .. release-notes::
    :branch: origin/stable/mitaka
diff --git a/releasenotes/source/newton.rst b/releasenotes/source/newton.rst
index a737f9aefb..cae5e7e9e1 100644
--- a/releasenotes/source/newton.rst
+++ b/releasenotes/source/newton.rst
@@ -1,6 +1,6 @@
-===========================
-Newton Series Release Notes
-===========================
+===========================================
+Newton Series (6.0.0 - 6.2.x) Release Notes
+===========================================
 
 .. release-notes::
    :branch: origin/stable/newton
diff --git a/releasenotes/source/ocata.rst b/releasenotes/source/ocata.rst
new file mode 100644
index 0000000000..1b0f1b619e
--- /dev/null
+++ b/releasenotes/source/ocata.rst
@@ -0,0 +1,6 @@
+==========================================
+Ocata Series (7.0.0 - 7.0.x) Release Notes
+==========================================
+
+.. release-notes::
+   :branch: origin/stable/ocata
diff --git a/releasenotes/source/unreleased.rst b/releasenotes/source/unreleased.rst
index 1cb0d59fb7..875030f9d0 100644
--- a/releasenotes/source/unreleased.rst
+++ b/releasenotes/source/unreleased.rst
@@ -1 +1,5 @@
-.. include:: current-series.rst
+============================
+Current Series Release Notes
+============================
+
+.. release-notes::