diff --git a/Rocky9_Rpi.ks b/Rocky9_Rpi.ks
index 1d52067..b5ebffa 100644
--- a/Rocky9_Rpi.ks
+++ b/Rocky9_Rpi.ks
@@ -1,8 +1,6 @@
 # Kickstart to build Rocky 8 image for Raspberry Pi 4 hardware (aarch64)
 #
 
-# (pull from pgreco:  https://github.com/psgreco/sig-core-AltArch/tree/master/image_build
-
 
 # Disk setup
 clearpart --initlabel --all
@@ -13,19 +11,20 @@ part / --asprimary --fstype=ext4 --size=2800 --label=RPIROOT
 
 
 # Repos setup:
-repo --name="BaseOS"     --baseurl=http://download.rockylinux.org/stg/rocky/9/BaseOS/aarch64/os/ --cost=100
-repo --name="AppStream"  --baseurl=http://download.rockylinux.org/stg/rocky/9/AppStream/aarch64/os/ --cost=200 --install
-repo --name="PowerTools" --baseurl=http://download.rockylinux.org/stg/rocky/9/BaseOS/aarch64/os/ --cost=300 --install
-repo --name="rockyrpi"  --baseurl=https://download.rockylinux.org/pub/sig/9/altarch/aarch64/altarch-rockyrpi/  --cost=50  --install
+url --url http://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/
+repo --name="BaseOS"     --baseurl=http://download.rockylinux.org/pub/rocky/9/BaseOS/aarch64/os/ --cost=100
+repo --name="AppStream"  --baseurl=http://download.rockylinux.org/pub/rocky/9/AppStream/aarch64/os/ --cost=200 --install
+repo --name="CRB" --baseurl=http://download.rockylinux.org/pub/rocky/9/crb/aarch64/os/ --cost=300 --install
+# Rocky Rpi kernel repo, we need a more permanent place for this:
+repo --name="rockyrpi" --baseurl=https://download.rockylinux.org/pub/sig/9/altarch/aarch64/altarch-rockyrpi/ --cost=20
 repo --name="rockyextras" --baseurl=https://download.rockylinux.org/pub/rocky/9/extras/aarch64/os/  --cost=20
 
-# Rocky Rpi kernel repo, we need a more permanent place for this:
-#repo --name="rockyrpi" --baseurl=https://download.rockylinux.org/pub/rocky/8/rockyrpi/aarch64/os/ --cost=20
-#repo --name="rockyextras" --baseurl=https://download.rockylinux.org/pub/rocky/8/extras/aarch64/os/  --cost=20
+
 
 
 
 # Install process:
+#text
 keyboard us --xlayouts=us --vckeymap=us
 rootpw --lock
 # FIXME user creation here does not work ?
@@ -34,11 +33,11 @@ timezone --isUtc --nontp UTC
 selinux --enforcing
 firewall --enabled --port=22:tcp
 network --bootproto=dhcp --device=link --activate --onboot=on
-services --enabled=sshd,NetworkManager,chronyd
+services --enabled=sshd,NetworkManager,chronyd,cpupower
 shutdown
 bootloader --location=none
 lang en_US.UTF-8
-
+skipx
 
 
 # Package selection:
@@ -55,7 +54,7 @@ NetworkManager-wifi
 vim
 bash-completion
 nano
-
+kernel-tools
 
 # Need these for setting default locale of en-US:
 langpacks-en
@@ -67,9 +66,6 @@ rocky-release-rpi
 raspberrypi2-firmware
 raspberrypi2-kernel4
 
-
-
-
 %end
 
 
@@ -158,6 +154,13 @@ yum clean all
 chown -R sssd:sssd /var/lib/sss/{db,pipes,mc,pubconf,gpo_cache}
 
 
+# Setting tuned profile to powersave by default -> sets the CPU governor to "ondemand".  This prevents overheating issues
+cat > /etc/sysconfig/cpupower << EOF
+# See 'cpupower help' and cpupower(1) for more info
+CPUPOWER_START_OPTS="frequency-set -g ondemand"
+CPUPOWER_STOP_OPTS="frequency-set -g ondemand"
+EOF
+
 
 %end
 
@@ -188,3 +191,4 @@ UUID_SWAP=$(/bin/grep 'swap'  $INSTALL_ROOT/etc/fstab  | awk '{print $1}' | awk
 /usr/sbin/mkswap -L "_swap" -p 4096  -U "${UUID_SWAP}"  /dev/disk/by-uuid/${UUID_SWAP}
 
 %end
+