diff --git a/.zuul.yaml b/.zuul.yaml
index 0a7246b593621786e50afab07ed76959451b9431..24a1c1141db25fee6de12f81b15d1c2b3258f766 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,7 @@
     templates:
       - check-requirements
       - lib-forward-testing-python3
-      - openstack-python3-victoria-jobs
+      - openstack-python3-zed-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff --git a/doc/source/conf.py b/doc/source/conf.py
index caebc5f36e6c1243260c705a198b6e629a60e8ca..d3a838c7f4467a8b768a6370492b2ba1b74a48b7 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -46,8 +46,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'oslo.metrics'
-copyright = u'2014, OpenStack Foundation'
+project = 'oslo.metrics'
+copyright = '2014, OpenStack Foundation'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
 add_function_parentheses = True
@@ -79,8 +79,8 @@ htmlhelp_basename = '%sdoc' % project
 latex_documents = [
     ('index',
      '%s.tex' % project,
-     u'%s Documentation' % project,
-     u'OpenStack Foundation', 'manual'),
+     '%s Documentation' % project,
+     'OpenStack Foundation', 'manual'),
 ]
 
 intersphinx_mapping = {
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index ef967c65358841794f2fd5cf669766f6d8b78b19..81017d248b2f2a2143ca0655b98410ddc8c30a18 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -58,8 +58,8 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'oslo.metrics Release Notes'
-copyright = u'2020, oslo.metrics Developers'
+project = 'oslo.metrics Release Notes'
+copyright = '2020, oslo.metrics Developers'
 
 # Release notes do not need a version in the title, they span
 # multiple versions.
@@ -208,8 +208,8 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     ('index', 'oslo.metricsReleaseNotes.tex',
-     u'oslo.metrics Release Notes Documentation',
-     u'oslo.metrics Developers', 'manual'),
+     'oslo.metrics Release Notes Documentation',
+     'oslo.metrics Developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -238,8 +238,8 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'oslo.metricsReleaseNotes',
-     u'oslo.metrics Release Notes Documentation',
-     [u'oslo.metrics Developers'], 1)
+     'oslo.metrics Release Notes Documentation',
+     ['oslo.metrics Developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -252,8 +252,8 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'oslo.metricsReleaseNotes',
-     u'oslo.metrics Release Notes Documentation',
-     u'oslo.metrics Developers', 'oslo.metricsReleaseNotes',
+     'oslo.metrics Release Notes Documentation',
+     'oslo.metrics Developers', 'oslo.metricsReleaseNotes',
      'One line description of project.',
      'Miscellaneous'),
 ]
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index ff3337e10014bb6daa213a51a4f8357501bd8cc9..01b559c61adea1a1455751144885d6c695a14b07 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -6,5 +6,6 @@ oslo.metrics Release Notes
    :maxdepth: 1
 
    unreleased
+   yoga
    xena
    wallaby
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 9a8db0d483e65a8d97bc2e2970c275f05f278e8f..32eb46b48af043eee9c777add513bd4416f8dc08 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ summary = Oslo Metrics API
 description_file =
     README.rst
 home_page = https://opendev.org/openstack/oslo.metrics
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Developers
@@ -15,9 +15,8 @@ classifier =
     Operating System :: OS Independent
     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