diff --git a/.zuul.yaml b/.zuul.yaml
index 4066fb485dcffe5fa00d43fb7bf0120e30f09d3c..24a1c1141db25fee6de12f81b15d1c2b3258f766 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,7 @@
     templates:
       - check-requirements
       - lib-forward-testing-python3
-      - openstack-python3-yoga-jobs
+      - openstack-python3-zed-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff --git a/oslo_service/locale/en_GB/LC_MESSAGES/oslo_service.po b/oslo_service/locale/en_GB/LC_MESSAGES/oslo_service.po
index c92668beb1a4fe94565ec7d30cf017d7cf099b3c..51c0635c9356db57271bf69d670432e947937fe9 100644
--- a/oslo_service/locale/en_GB/LC_MESSAGES/oslo_service.po
+++ b/oslo_service/locale/en_GB/LC_MESSAGES/oslo_service.po
@@ -1,15 +1,16 @@
 # Andi Chandler <andi@gowling.com>, 2016. #zanata
 # Andreas Jaeger <jaegerandi@gmail.com>, 2016. #zanata
 # Andi Chandler <andi@gowling.com>, 2017. #zanata
+# Andi Chandler <andi@gowling.com>, 2022. #zanata
 msgid ""
 msgstr ""
 "Project-Id-Version: oslo.service VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n"
-"POT-Creation-Date: 2018-01-30 05:35+0000\n"
+"POT-Creation-Date: 2022-05-11 15:55+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2017-10-07 09:30+0000\n"
+"PO-Revision-Date: 2022-06-13 07:39+0000\n"
 "Last-Translator: Andi Chandler <andi@gowling.com>\n"
 "Language-Team: English (United Kingdom)\n"
 "Language: en_GB\n"
@@ -104,6 +105,9 @@ msgstr "Service %(service)s must an instance of %(base)s!"
 msgid "The backlog must be more than 0"
 msgstr "The backlog must be more than 0"
 
+msgid "Type of workers should be int!"
+msgstr "Type of workers should be int!"
+
 #, python-format
 msgid "Unable to find ca_file : %s"
 msgstr "Unable to find ca_file : %s"
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index ae4e6d8986296fbe0a47ec079b7fd621b7166535..3fe0db208fd1ee2248811f9f1b86e2d3f8e3b0d3 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -6,6 +6,7 @@
    :maxdepth: 1
 
    unreleased
+   yoga
    xena
    wallaby
    victoria
diff --git a/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po b/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po
deleted file mode 100644
index ace4f4dbf3a0a2e4aa94c90dca0d80e3a7d35dd4..0000000000000000000000000000000000000000
--- a/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# Gérald LONLAS <g.lonlas@gmail.com>, 2016. #zanata
-msgid ""
-msgstr ""
-"Project-Id-Version: oslo.service Release Notes\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-01 11:24+0000\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"PO-Revision-Date: 2016-10-22 06:05+0000\n"
-"Last-Translator: Gérald LONLAS <g.lonlas@gmail.com>\n"
-"Language-Team: French\n"
-"Language: fr\n"
-"X-Generator: Zanata 4.3.3\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-
-msgid "Other Notes"
-msgstr "Autres notes"
-
-msgid "Switch to reno for managing release notes."
-msgstr "Commence à utiliser reno pour la gestion des notes de release"
-
-msgid "Unreleased Release Notes"
-msgstr "Note de release pour les changements non déployées"
-
-msgid "oslo.service Release Notes"
-msgstr "Note de release pour oslo.service"
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 902899ed74265009c3e7ecfe7ff530006fca8d2b..db2e05441e686fcc3d6034f57a8ae6f261b3aff3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/oslo.service/latest/
-python_requires = >=3.6
+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