diff --git a/.zuul.yaml b/.zuul.yaml
index abd007fafc7e8cbc6b20227ee0e8dbcc9f107071..5d7ccb21d0fe4ab964f3c326af253e8ac15f06a1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,7 @@
 - project:
     templates:
       - publish-openstack-docs-pti
-      - openstack-python3-yoga-jobs
+      - openstack-python3-zed-jobs
       - check-requirements
       - release-notes-jobs-python3
       - periodic-stable-jobs
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index e1c479baed91f2ab14cac53094efce9466b63e5a..6d1505f0f57342bb46667819b668608e5f3d8ad8 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -5,6 +5,7 @@ oslo.upgradecheck Release Notes
    :maxdepth: 1
 
    unreleased
+   yoga
    xena
    wallaby
    victoria
diff --git a/releasenotes/source/yoga.rst b/releasenotes/source/yoga.rst
new file mode 100644
index 0000000000000000000000000000000000000000..7cd5e908a7de01e943ed55fdd485eb0e393ba1c3
--- /dev/null
+++ b/releasenotes/source/yoga.rst
@@ -0,0 +1,6 @@
+=========================
+Yoga Series Release Notes
+=========================
+
+.. release-notes::
+   :branch: stable/yoga
diff --git a/setup.cfg b/setup.cfg
index e7af19034e9d37d509436da268aaf561f5ba7787..2dc51aaa1d0cfa5ff14a196cd7d1f88da3cbbb8f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,12 @@
 [metadata]
 name = oslo.upgradecheck
 summary = Common code for writing OpenStack upgrade checks
-description-file =
+description_file =
     README.rst
 author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
-home-page = http://launchpad.net/oslo
-python-requires = >=3.6
+author_email = openstack-discuss@lists.openstack.org
+home_page = http://launchpad.net/oslo
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -15,9 +15,8 @@ classifier =
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: Implementation :: CPython