diff --git a/Rocky-8-Container.ks b/Rocky-9-Container.ks
similarity index 96%
rename from Rocky-8-Container.ks
rename to Rocky-9-Container.ks
index 68ff174..e613089 100644
--- a/Rocky-8-Container.ks
+++ b/Rocky-9-Container.ks
@@ -4,7 +4,7 @@
 
 # Basic setup information
 
-url --url https://dl.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/
+url --url https://dl.rockylinux.org/stg/rocky/9/BaseOS/$basearch/os/
 
 bootloader --disable
 firewall --disabled
diff --git a/Rocky-8-EC2.ks b/Rocky-9-EC2.ks
similarity index 99%
rename from Rocky-8-EC2.ks
rename to Rocky-9-EC2.ks
index f523100..73c680c 100644
--- a/Rocky-8-EC2.ks
+++ b/Rocky-9-EC2.ks
@@ -113,7 +113,7 @@ dnf clean all
 # XXX instance type markers - MUST match Rocky Infra expectation
 echo 'ec2' > /etc/yum/vars/infra
 
-# change dhcp client retry/timeouts to resolve #6866
+# change dhcp client retry/timeouts to resolve #69.0
 cat  >> /etc/dhcp/dhclient.conf << EOF
 
 timeout 300;
diff --git a/Rocky-8-GenericCloud.ks b/Rocky-9-GenericCloud.ks
similarity index 98%
rename from Rocky-8-GenericCloud.ks
rename to Rocky-9-GenericCloud.ks
index b1bee4f..a49dc7b 100644
--- a/Rocky-8-GenericCloud.ks
+++ b/Rocky-9-GenericCloud.ks
@@ -113,7 +113,7 @@ dnf clean all
 # XXX instance type markers - MUST match Rocky Infra expectation
 echo 'genclo' > /etc/yum/vars/infra
 
-# change dhcp client retry/timeouts to resolve #6866
+# change dhcp client retry/timeouts to resolve #69.0
 cat  >> /etc/dhcp/dhclient.conf << EOF
 
 timeout 300;
diff --git a/Rocky-8-KDE.ks b/Rocky-9-KDE.ks
similarity index 96%
rename from Rocky-8-KDE.ks
rename to Rocky-9-KDE.ks
index 926f223..2c64e40 100644
--- a/Rocky-8-KDE.ks
+++ b/Rocky-9-KDE.ks
@@ -15,11 +15,11 @@ network  --bootproto=dhcp --device=link --activate
 # Firewall configuration
 firewall --enabled --service=mdns
 # Use network installation
-url --url="http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/"
-repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ --cost=200
-repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ --cost=200
-repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ --cost=200
-repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os --cost=200
+url --url="http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/"
+repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/ --cost=200
+repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/AppStream/$basearch/os/ --cost=200
+repo --name="CRB" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/CRB/$basearch/os/ --cost=200
+repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/extras/$basearch/os --cost=200
 repo --name="epel" --baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/$basearch/ --cost=200
 repo --name="epel-modular" --baseurl=https://dl.fedoraproject.org/pub/epel/8/Modular/$basearch/ --cost=200
 # System timezone
@@ -186,7 +186,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
@@ -311,7 +311,7 @@ rm -f /boot/*-rescue*
 rm -f /etc/machine-id
 touch /etc/machine-id
 
-# set default GTK+ theme for root (see #683855, #689070, #808062)
+# set default GTK+ theme for root (see #683855, #689070, #809.02)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
@@ -416,7 +416,7 @@ restorecon -R /
 EOF
 
 systemctl enable --force sddm.service
-dnf config-manager --set-enabled powertools
+dnf config-manager --set-enabled crb
 
 %end
 
diff --git a/Rocky-8-Workstation-Lite.ks b/Rocky-9-Workstation-Lite.ks
similarity index 97%
rename from Rocky-8-Workstation-Lite.ks
rename to Rocky-9-Workstation-Lite.ks
index 1275916..1299176 100644
--- a/Rocky-8-Workstation-Lite.ks
+++ b/Rocky-9-Workstation-Lite.ks
@@ -15,11 +15,11 @@ network  --bootproto=dhcp --device=link --activate
 # Firewall configuration
 firewall --enabled --service=mdns
 # Use network installation
-url --url="http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/"
-repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ --cost=200
-repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ --cost=200
-repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ --cost=200
-repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os --cost=200
+url --url="http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/"
+repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/ --cost=200
+repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/AppStream/$basearch/os/ --cost=200
+repo --name="CRB" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/CRB/$basearch/os/ --cost=200
+repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/extras/$basearch/os --cost=200
 # System timezone
 timezone US/Eastern
 # SELinux configuration
@@ -184,7 +184,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
diff --git a/Rocky-8-Workstation-Mainline.ks b/Rocky-9-Workstation-Mainline.ks
similarity index 97%
rename from Rocky-8-Workstation-Mainline.ks
rename to Rocky-9-Workstation-Mainline.ks
index d4d0b69..423d673 100644
--- a/Rocky-8-Workstation-Mainline.ks
+++ b/Rocky-9-Workstation-Mainline.ks
@@ -21,13 +21,13 @@ selinux --enforcing
 
 # System services
 services --disabled="sshd" --enabled="NetworkManager,ModemManager"
-repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ --cost=200
-repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ --cost=200
-repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ --cost=200
-repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os --cost=200
+repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/ --cost=200
+repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/AppStream/$basearch/os/ --cost=200
+repo --name="CRB" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/CRB/$basearch/os/ --cost=200
+repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/extras/$basearch/os --cost=200
 repo --name="elrepo-kernel" --baseurl=https://elrepo.org/linux/kernel/el8/$basearch/ --cost=200
 # Use network installation
-url --url="http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/"
+url --url="http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/"
 # System bootloader configuration
 bootloader --location=none
 # Clear the Master Boot Record
@@ -186,7 +186,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
diff --git a/Rocky-8-Workstation.ks b/Rocky-9-Workstation.ks
similarity index 97%
rename from Rocky-8-Workstation.ks
rename to Rocky-9-Workstation.ks
index d007f33..4546bb0 100644
--- a/Rocky-8-Workstation.ks
+++ b/Rocky-9-Workstation.ks
@@ -15,11 +15,11 @@ network  --bootproto=dhcp --device=link --activate
 # Firewall configuration
 firewall --enabled --service=mdns
 # Use network installation
-url --url="http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/"
-repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ --cost=200
-repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ --cost=200
-repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ --cost=200
-repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os --cost=200
+url --url="http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/"
+repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/ --cost=200
+repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/AppStream/$basearch/os/ --cost=200
+repo --name="CRB" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/CRB/$basearch/os/ --cost=200
+repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/extras/$basearch/os --cost=200
 # System timezone
 timezone US/Eastern
 # SELinux configuration
@@ -184,7 +184,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
diff --git a/Rocky-8-XFCE.ks b/Rocky-9-XFCE.ks
similarity index 97%
rename from Rocky-8-XFCE.ks
rename to Rocky-9-XFCE.ks
index 8e4c6f6..3a66707 100644
--- a/Rocky-8-XFCE.ks
+++ b/Rocky-9-XFCE.ks
@@ -15,11 +15,11 @@ network  --bootproto=dhcp --device=link --activate
 # Firewall configuration
 firewall --enabled --service=mdns
 # Use network installation
-url --url="http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/"
-repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/ --cost=200
-repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/ --cost=200
-repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/ --cost=200
-repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os --cost=200
+url --url="http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/"
+repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/ --cost=200
+repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/AppStream/$basearch/os/ --cost=200
+repo --name="CRB" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/CRB/$basearch/os/ --cost=200
+repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/extras/$basearch/os --cost=200
 repo --name="epel" --baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/$basearch/ --cost=200
 repo --name="epel-modular" --baseurl=https://dl.fedoraproject.org/pub/epel/8/Modular/$basearch/ --cost=200
 # System timezone
@@ -186,7 +186,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
@@ -391,7 +391,7 @@ EOF
 
 # this doesn't come up automatically. not sure why.
 systemctl enable --force lightdm.service
-dnf config-manager --set-enabled powertools
+dnf config-manager --set-enabled crb
 
 %end
 
diff --git a/Rocky-8-x86_64-Vagrant-VBox.ks b/Rocky-9-x86_64-Vagrant-VBox.ks
similarity index 98%
rename from Rocky-8-x86_64-Vagrant-VBox.ks
rename to Rocky-9-x86_64-Vagrant-VBox.ks
index 942d534..f6d55fb 100644
--- a/Rocky-8-x86_64-Vagrant-VBox.ks
+++ b/Rocky-9-x86_64-Vagrant-VBox.ks
@@ -1,5 +1,5 @@
-url --url=http://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os
-repo --name=AppStream --baseurl=http://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os
+url --url=http://dl.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os
+repo --name=AppStream --baseurl=http://dl.rockylinux.org/pub/rocky/9/AppStream/x86_64/os
 text
 keyboard --vckeymap us
 lang en_US
diff --git a/Rocky-8-x86_64-Vagrant.ks b/Rocky-9-x86_64-Vagrant.ks
similarity index 98%
rename from Rocky-8-x86_64-Vagrant.ks
rename to Rocky-9-x86_64-Vagrant.ks
index a33e238..1b5eab4 100644
--- a/Rocky-8-x86_64-Vagrant.ks
+++ b/Rocky-9-x86_64-Vagrant.ks
@@ -1,5 +1,5 @@
-url --url=http://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os
-repo --name=AppStream --baseurl=http://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os
+url --url=http://dl.rockylinux.org/pub/rocky/9/BaseOS/x86_64/os
+repo --name=AppStream --baseurl=http://dl.rockylinux.org/pub/rocky/9/AppStream/x86_64/os
 text
 keyboard --vckeymap us
 lang en_US
diff --git a/live/8/prod/mainline/rocky-live-base.ks b/live/9/prod/mainline/rocky-live-base.ks
similarity index 99%
rename from live/8/prod/mainline/rocky-live-base.ks
rename to live/9/prod/mainline/rocky-live-base.ks
index 52d09db..282b2ce 100644
--- a/live/8/prod/mainline/rocky-live-base.ks
+++ b/live/9/prod/mainline/rocky-live-base.ks
@@ -205,7 +205,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
diff --git a/live/8/prod/mainline/rocky-live-workstation.ks b/live/9/prod/mainline/rocky-live-workstation.ks
similarity index 100%
rename from live/8/prod/mainline/rocky-live-workstation.ks
rename to live/9/prod/mainline/rocky-live-workstation.ks
diff --git a/live/8/prod/mainline/rocky-repo-mainline.ks b/live/9/prod/mainline/rocky-repo-mainline.ks
similarity index 64%
rename from live/8/prod/mainline/rocky-repo-mainline.ks
rename to live/9/prod/mainline/rocky-repo-mainline.ks
index 8157eec..2e32a8f 100644
--- a/live/8/prod/mainline/rocky-repo-mainline.ks
+++ b/live/9/prod/mainline/rocky-repo-mainline.ks
@@ -1,14 +1,14 @@
 # These should change based on the major/minor release
 
 # Deps repo, there are some anaconda packages that are *not* available by default
-repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/
-repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/
-repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/
-repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os
+repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/AppStream/$basearch/os/
+repo --name=CRB --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/CRB/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/extras/$basearch/os
 
 # ELRepo
 repo --name="elrepo-kernel" --baseurl=https://elrepo.org/linux/kernel/el8/$basearch/ --cost=200
 
 # URL to the base os repo
-url --url=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/
+url --url=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/
 #url --url=http://10.100.0.1/pub/deps
diff --git a/live/8/prod/mainline/rocky-workstation-common.ks b/live/9/prod/mainline/rocky-workstation-common.ks
similarity index 100%
rename from live/8/prod/mainline/rocky-workstation-common.ks
rename to live/9/prod/mainline/rocky-workstation-common.ks
diff --git a/live/8/stage/rocky-live-base-spin.ks b/live/9/prod/rocky-live-base-spin.ks
similarity index 99%
rename from live/8/stage/rocky-live-base-spin.ks
rename to live/9/prod/rocky-live-base-spin.ks
index 4831b29..820468a 100644
--- a/live/8/stage/rocky-live-base-spin.ks
+++ b/live/9/prod/rocky-live-base-spin.ks
@@ -207,7 +207,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
diff --git a/live/8/prod/rocky-live-base.ks b/live/9/prod/rocky-live-base.ks
similarity index 99%
rename from live/8/prod/rocky-live-base.ks
rename to live/9/prod/rocky-live-base.ks
index abb59f6..c904d95 100644
--- a/live/8/prod/rocky-live-base.ks
+++ b/live/9/prod/rocky-live-base.ks
@@ -203,7 +203,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
diff --git a/live/8/prod/rocky-live-kde-base.ks b/live/9/prod/rocky-live-kde-base.ks
similarity index 96%
rename from live/8/prod/rocky-live-kde-base.ks
rename to live/9/prod/rocky-live-kde-base.ks
index 44cd32d..35870c1 100644
--- a/live/8/prod/rocky-live-kde-base.ks
+++ b/live/9/prod/rocky-live-kde-base.ks
@@ -5,7 +5,7 @@
 
 %post
 
-# set default GTK+ theme for root (see #683855, #689070, #808062)
+# set default GTK+ theme for root (see #683855, #689070, #809.02)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
@@ -110,6 +110,6 @@ restorecon -R /
 EOF
 
 systemctl enable --force sddm.service
-dnf config-manager --set-enabled powertools
+dnf config-manager --set-enabled crb
 
 %end
diff --git a/live/8/prod/rocky-live-kde-common.ks b/live/9/prod/rocky-live-kde-common.ks
similarity index 100%
rename from live/8/prod/rocky-live-kde-common.ks
rename to live/9/prod/rocky-live-kde-common.ks
diff --git a/live/8/prod/rocky-live-kde-minimization.ks b/live/9/prod/rocky-live-kde-minimization.ks
similarity index 100%
rename from live/8/prod/rocky-live-kde-minimization.ks
rename to live/9/prod/rocky-live-kde-minimization.ks
diff --git a/live/8/prod/rocky-live-kde.ks b/live/9/prod/rocky-live-kde.ks
similarity index 100%
rename from live/8/prod/rocky-live-kde.ks
rename to live/9/prod/rocky-live-kde.ks
diff --git a/live/8/prod/rocky-live-minimization.ks b/live/9/prod/rocky-live-minimization.ks
similarity index 100%
rename from live/8/prod/rocky-live-minimization.ks
rename to live/9/prod/rocky-live-minimization.ks
diff --git a/live/8/prod/rocky-live-workstation-lite.ks b/live/9/prod/rocky-live-workstation-lite.ks
similarity index 100%
rename from live/8/prod/rocky-live-workstation-lite.ks
rename to live/9/prod/rocky-live-workstation-lite.ks
diff --git a/live/8/prod/rocky-live-workstation.ks b/live/9/prod/rocky-live-workstation.ks
similarity index 100%
rename from live/8/prod/rocky-live-workstation.ks
rename to live/9/prod/rocky-live-workstation.ks
diff --git a/live/8/prod/rocky-live-xfce-common.ks b/live/9/prod/rocky-live-xfce-common.ks
similarity index 100%
rename from live/8/prod/rocky-live-xfce-common.ks
rename to live/9/prod/rocky-live-xfce-common.ks
diff --git a/live/8/prod/rocky-live-xfce.ks b/live/9/prod/rocky-live-xfce.ks
similarity index 98%
rename from live/8/prod/rocky-live-xfce.ks
rename to live/9/prod/rocky-live-xfce.ks
index b022566..e6508cc 100644
--- a/live/8/prod/rocky-live-xfce.ks
+++ b/live/9/prod/rocky-live-xfce.ks
@@ -87,6 +87,6 @@ EOF
 
 # this doesn't come up automatically. not sure why.
 systemctl enable --force lightdm.service
-dnf config-manager --set-enabled powertools
+dnf config-manager --set-enabled crb
 
 %end
diff --git a/live/8/prod/rocky-repo-epel.ks b/live/9/prod/rocky-repo-epel.ks
similarity index 69%
rename from live/8/prod/rocky-repo-epel.ks
rename to live/9/prod/rocky-repo-epel.ks
index 8fe92a0..aa163b4 100644
--- a/live/8/prod/rocky-repo-epel.ks
+++ b/live/9/prod/rocky-repo-epel.ks
@@ -1,15 +1,15 @@
 # These should change based on the major/minor release
 
 # Deps repo, there are some anaconda packages that are *not* available by default
-repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/
-repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/
-repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/
-repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os
+repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/AppStream/$basearch/os/
+repo --name=CRB --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/CRB/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/extras/$basearch/os
 
 # EPEL (required for KDE and XFCE)
 repo --name=epel --cost=200 --baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/$basearch/
 repo --name=epel-modular --cost=200 --baseurl=https://dl.fedoraproject.org/pub/epel/8/Modular/$basearch/
 
 # URL to the base os repo
-url --url=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/
+url --url=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/
 #url --url=http://10.100.0.1/pub/deps
diff --git a/live/8/stage/rocky-repo.ks b/live/9/prod/rocky-repo.ks
similarity index 50%
rename from live/8/stage/rocky-repo.ks
rename to live/9/prod/rocky-repo.ks
index 7d96b47..bba93fc 100644
--- a/live/8/stage/rocky-repo.ks
+++ b/live/9/prod/rocky-repo.ks
@@ -1,10 +1,10 @@
 # These should change based on the major/minor release
 
 # Base repos
-repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/
-repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/AppStream/$basearch/os/
-repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/PowerTools/$basearch/os/
-repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/extras/$basearch/os
+repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/AppStream/$basearch/os/
+repo --name=CRB --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/CRB/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/9.0/extras/$basearch/os
 
 # URL to the base os repo
-url --url=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/
+url --url=http://dl.rockylinux.org/pub/rocky/9.0/BaseOS/$basearch/os/
diff --git a/live/8/prod/rocky-workstation-common-lite.ks b/live/9/prod/rocky-workstation-common-lite.ks
similarity index 100%
rename from live/8/prod/rocky-workstation-common-lite.ks
rename to live/9/prod/rocky-workstation-common-lite.ks
diff --git a/live/8/prod/rocky-workstation-common.ks b/live/9/prod/rocky-workstation-common.ks
similarity index 100%
rename from live/8/prod/rocky-workstation-common.ks
rename to live/9/prod/rocky-workstation-common.ks
diff --git a/live/8/stage/mainline/rocky-live-base.ks b/live/9/stage/mainline/rocky-live-base.ks
similarity index 99%
rename from live/8/stage/mainline/rocky-live-base.ks
rename to live/9/stage/mainline/rocky-live-base.ks
index b3e05cc..c0aa4aa 100644
--- a/live/8/stage/mainline/rocky-live-base.ks
+++ b/live/9/stage/mainline/rocky-live-base.ks
@@ -204,7 +204,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
diff --git a/live/8/stage/mainline/rocky-live-workstation.ks b/live/9/stage/mainline/rocky-live-workstation.ks
similarity index 100%
rename from live/8/stage/mainline/rocky-live-workstation.ks
rename to live/9/stage/mainline/rocky-live-workstation.ks
diff --git a/live/8/stage/mainline/rocky-repo-mainline.ks b/live/9/stage/mainline/rocky-repo-mainline.ks
similarity index 64%
rename from live/8/stage/mainline/rocky-repo-mainline.ks
rename to live/9/stage/mainline/rocky-repo-mainline.ks
index 9473d22..e31abf1 100644
--- a/live/8/stage/mainline/rocky-repo-mainline.ks
+++ b/live/9/stage/mainline/rocky-repo-mainline.ks
@@ -1,14 +1,14 @@
 # These should change based on the major/minor release
 
 # Deps repo, there are some anaconda packages that are *not* available by default
-repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/
-repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/AppStream/$basearch/os/
-repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/PowerTools/$basearch/os/
-repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/extras/$basearch/os
+repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/AppStream/$basearch/os/
+repo --name=CRB --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/CRB/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/extras/$basearch/os
 
 # ELRepo
 repo --name="elrepo-kernel" --baseurl=https://elrepo.org/linux/kernel/el8/$basearch/ --cost=200
 
 # URL to the base os repo
-url --url=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/
+url --url=http://dl.rockylinux.org/stg/rocky/9.0/BaseOS/$basearch/os/
 #url --url=http://10.100.0.1/pub/deps
diff --git a/live/8/stage/mainline/rocky-workstation-common.ks b/live/9/stage/mainline/rocky-workstation-common.ks
similarity index 100%
rename from live/8/stage/mainline/rocky-workstation-common.ks
rename to live/9/stage/mainline/rocky-workstation-common.ks
diff --git a/live/8/prod/rocky-live-base-spin.ks b/live/9/stage/rocky-live-base-spin.ks
similarity index 99%
rename from live/8/prod/rocky-live-base-spin.ks
rename to live/9/stage/rocky-live-base-spin.ks
index 4831b29..820468a 100644
--- a/live/8/prod/rocky-live-base-spin.ks
+++ b/live/9/stage/rocky-live-base-spin.ks
@@ -207,7 +207,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
diff --git a/live/8/stage/rocky-live-base.ks b/live/9/stage/rocky-live-base.ks
similarity index 99%
rename from live/8/stage/rocky-live-base.ks
rename to live/9/stage/rocky-live-base.ks
index abb59f6..c904d95 100644
--- a/live/8/stage/rocky-live-base.ks
+++ b/live/9/stage/rocky-live-base.ks
@@ -203,7 +203,7 @@ systemctl stop atd.service 2> /dev/null || :
 systemctl --no-reload disable abrtd.service 2> /dev/null || :
 systemctl stop abrtd.service 2> /dev/null || :
 
-# Don't sync the system clock when running live (RHBZ #1018162)
+# Don't sync the system clock when running live (RHBZ #1019.02)
 sed -i 's/rtcsync//' /etc/chrony.conf
 
 # Mark things as configured
diff --git a/live/8/stage/rocky-live-kde-base.ks b/live/9/stage/rocky-live-kde-base.ks
similarity index 96%
rename from live/8/stage/rocky-live-kde-base.ks
rename to live/9/stage/rocky-live-kde-base.ks
index 44cd32d..35870c1 100644
--- a/live/8/stage/rocky-live-kde-base.ks
+++ b/live/9/stage/rocky-live-kde-base.ks
@@ -5,7 +5,7 @@
 
 %post
 
-# set default GTK+ theme for root (see #683855, #689070, #808062)
+# set default GTK+ theme for root (see #683855, #689070, #809.02)
 cat > /root/.gtkrc-2.0 << EOF
 include "/usr/share/themes/Adwaita/gtk-2.0/gtkrc"
 include "/etc/gtk-2.0/gtkrc"
@@ -110,6 +110,6 @@ restorecon -R /
 EOF
 
 systemctl enable --force sddm.service
-dnf config-manager --set-enabled powertools
+dnf config-manager --set-enabled crb
 
 %end
diff --git a/live/8/stage/rocky-live-kde-common.ks b/live/9/stage/rocky-live-kde-common.ks
similarity index 100%
rename from live/8/stage/rocky-live-kde-common.ks
rename to live/9/stage/rocky-live-kde-common.ks
diff --git a/live/8/stage/rocky-live-kde-minimization.ks b/live/9/stage/rocky-live-kde-minimization.ks
similarity index 100%
rename from live/8/stage/rocky-live-kde-minimization.ks
rename to live/9/stage/rocky-live-kde-minimization.ks
diff --git a/live/8/stage/rocky-live-kde.ks b/live/9/stage/rocky-live-kde.ks
similarity index 100%
rename from live/8/stage/rocky-live-kde.ks
rename to live/9/stage/rocky-live-kde.ks
diff --git a/live/8/stage/rocky-live-minimization.ks b/live/9/stage/rocky-live-minimization.ks
similarity index 100%
rename from live/8/stage/rocky-live-minimization.ks
rename to live/9/stage/rocky-live-minimization.ks
diff --git a/live/8/stage/rocky-live-workstation-lite.ks b/live/9/stage/rocky-live-workstation-lite.ks
similarity index 100%
rename from live/8/stage/rocky-live-workstation-lite.ks
rename to live/9/stage/rocky-live-workstation-lite.ks
diff --git a/live/8/stage/rocky-live-workstation.ks b/live/9/stage/rocky-live-workstation.ks
similarity index 100%
rename from live/8/stage/rocky-live-workstation.ks
rename to live/9/stage/rocky-live-workstation.ks
diff --git a/live/8/stage/rocky-live-xfce-common.ks b/live/9/stage/rocky-live-xfce-common.ks
similarity index 100%
rename from live/8/stage/rocky-live-xfce-common.ks
rename to live/9/stage/rocky-live-xfce-common.ks
diff --git a/live/8/stage/rocky-live-xfce.ks b/live/9/stage/rocky-live-xfce.ks
similarity index 98%
rename from live/8/stage/rocky-live-xfce.ks
rename to live/9/stage/rocky-live-xfce.ks
index b022566..e6508cc 100644
--- a/live/8/stage/rocky-live-xfce.ks
+++ b/live/9/stage/rocky-live-xfce.ks
@@ -87,6 +87,6 @@ EOF
 
 # this doesn't come up automatically. not sure why.
 systemctl enable --force lightdm.service
-dnf config-manager --set-enabled powertools
+dnf config-manager --set-enabled crb
 
 %end
diff --git a/live/8/stage/rocky-repo-epel.ks b/live/9/stage/rocky-repo-epel.ks
similarity index 69%
rename from live/8/stage/rocky-repo-epel.ks
rename to live/9/stage/rocky-repo-epel.ks
index a104f83..3f02c04 100644
--- a/live/8/stage/rocky-repo-epel.ks
+++ b/live/9/stage/rocky-repo-epel.ks
@@ -1,15 +1,15 @@
 # These should change based on the major/minor release
 
 # Deps repo, there are some anaconda packages that are *not* available by default
-repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/
-repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/AppStream/$basearch/os/
-repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/PowerTools/$basearch/os/
-repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.6/extras/$basearch/os
+repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/AppStream/$basearch/os/
+repo --name=CRB --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/CRB/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/extras/$basearch/os
 
 # EPEL (required for KDE and XFCE)
 repo --name=epel --cost=200 --baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/$basearch/
 repo --name=epel-modular --cost=200 --baseurl=https://dl.fedoraproject.org/pub/epel/8/Modular/$basearch/
 
 # URL to the base os repo
-url --url=http://dl.rockylinux.org/stg/rocky/8.6/BaseOS/$basearch/os/
+url --url=http://dl.rockylinux.org/stg/rocky/9.0/BaseOS/$basearch/os/
 #url --url=http://10.100.0.1/pub/deps
diff --git a/live/8/prod/rocky-repo.ks b/live/9/stage/rocky-repo.ks
similarity index 50%
rename from live/8/prod/rocky-repo.ks
rename to live/9/stage/rocky-repo.ks
index 134bb27..ec4f009 100644
--- a/live/8/prod/rocky-repo.ks
+++ b/live/9/stage/rocky-repo.ks
@@ -1,10 +1,10 @@
 # These should change based on the major/minor release
 
 # Base repos
-repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/
-repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/AppStream/$basearch/os/
-repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/PowerTools/$basearch/os/
-repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.6/extras/$basearch/os
+repo --name=BaseOS --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/AppStream/$basearch/os/
+repo --name=CRB --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/CRB/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/9.0/extras/$basearch/os
 
 # URL to the base os repo
-url --url=http://dl.rockylinux.org/pub/rocky/8.6/BaseOS/$basearch/os/
+url --url=http://dl.rockylinux.org/stg/rocky/9.0/BaseOS/$basearch/os/
diff --git a/live/8/stage/rocky-workstation-common-lite.ks b/live/9/stage/rocky-workstation-common-lite.ks
similarity index 100%
rename from live/8/stage/rocky-workstation-common-lite.ks
rename to live/9/stage/rocky-workstation-common-lite.ks
diff --git a/live/8/stage/rocky-workstation-common.ks b/live/9/stage/rocky-workstation-common.ks
similarity index 100%
rename from live/8/stage/rocky-workstation-common.ks
rename to live/9/stage/rocky-workstation-common.ks