diff --git a/.zuul.yaml b/.zuul.yaml
index adbcf513ce62b9acbebcb28ef044eeddd0997d76..2818143efada66c13c472b00cb03bc1d4fc4a40d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,7 +5,7 @@
     templates:
       - check-requirements
       - lib-forward-testing-python3
-      - openstack-python3-xena-jobs
+      - openstack-python3-yoga-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 57fb6906121e3d36b28420e1664aa4e271086a3e..06780ac9da8d0074d72c8c464be80f14e1481796 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -6,6 +6,7 @@
    :maxdepth: 1
 
    unreleased
+   xena
    wallaby
    victoria
    ussuri
diff --git a/releasenotes/source/xena.rst b/releasenotes/source/xena.rst
new file mode 100644
index 0000000000000000000000000000000000000000..1be85be3ebf18741d311aa41096d417a99c970bf
--- /dev/null
+++ b/releasenotes/source/xena.rst
@@ -0,0 +1,6 @@
+=========================
+Xena Series Release Notes
+=========================
+
+.. release-notes::
+   :branch: stable/xena
diff --git a/setup.cfg b/setup.cfg
index a13e7e1fde859c212be3b9357f65061bd7b66587..33bbb7a53ea7df4c94ffd1f335709a0f30a8c727 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ classifier =
     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