diff --git a/bindep.txt b/bindep.txt
index a30ab32a0..cecc54ea4 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,6 +1,6 @@
 # NOTE(rpittau): the EPEL repository for centos 9 stream should be
 # epel-next but it's not ready yet
-epel-release        [(platform:centos !platform:centos-9) (platform:rhel !platform:centos-9)]
+epel-release        [(platform:centos !platform:centos-9) (platform:redhat !platform:centos-9)]
 gcc
 git
 libffi-devel        [platform:redhat platform:suse]
diff --git a/doc/source/install/index.rst b/doc/source/install/index.rst
index 681042a19..2d84d6729 100644
--- a/doc/source/install/index.rst
+++ b/doc/source/install/index.rst
@@ -14,10 +14,11 @@ Supported operating systems
 
 Full support (fully tested in the CI, no known or potential issues):
 
-* CentOS Stream 8
+* CentOS Stream 9
+* CentOS Stream 8 (deprecated but will keep running normal CI until Z cycle)
 
   .. note::
-     RHEL 8 and regular CentOS 8 are assumed to work but not tested explicitly.
+     RHEL is assumed to work but not tested explicitly.
 
 * Ubuntu 20.04 "Focal"
 * Debian 11 "Bullseye"
diff --git a/playbooks/roles/bifrost-prepare-for-test-dynamic/tasks/main.yml b/playbooks/roles/bifrost-prepare-for-test-dynamic/tasks/main.yml
index fa903935f..322dc2a42 100644
--- a/playbooks/roles/bifrost-prepare-for-test-dynamic/tasks/main.yml
+++ b/playbooks/roles/bifrost-prepare-for-test-dynamic/tasks/main.yml
@@ -55,13 +55,11 @@
   shell: ssh-keyscan "{{ ipv4_address }}" >> "{{ ansible_env.HOME }}/.ssh/known_hosts"
   when: ipv4_address is defined
 - name: "Allow ssh-rsa algorithm for CentOS Stream 9"
-  block:
-    - name: "Add ssh-rsa algorithm to ssh config"
-      shell: echo "PubkeyAcceptedKeyTypes +ssh-rsa" >> ~/.ssh/config
-    - name: "Set correct permissions for ssh config"
-      file:
-        path: ~/.ssh/config
-        mode: '0600'
+  lineinfile:
+    path: ~/.ssh/config
+    line: PubkeyAcceptedKeyTypes +ssh-rsa
+    create: yes
+    mode: '0600'
   when:
     - ansible_distribution == "CentOS"
     - ansible_distribution_version|int >= 9
\ No newline at end of file
diff --git a/releasenotes/notes/centos9-16c9853d1dd0554b.yaml b/releasenotes/notes/centos9-16c9853d1dd0554b.yaml
index a9bdf4d78..d574f43aa 100644
--- a/releasenotes/notes/centos9-16c9853d1dd0554b.yaml
+++ b/releasenotes/notes/centos9-16c9853d1dd0554b.yaml
@@ -1,4 +1,8 @@
 ---
-other:
+features:
   - |
     Adds basic support for running bifrost on CentOS Stream 9.
+deprecations:
+  - |
+    CentOS Stream 8 and Python 3.6 support is now deprecated and will be
+    best-effort starting with the Z cycle.