diff --git a/Rocky8_Rpi4.ks b/Rocky8_Rpi4.ks
index 9993fee..39e796e 100644
--- a/Rocky8_Rpi4.ks
+++ b/Rocky8_Rpi4.ks
@@ -17,7 +17,8 @@ repo --name="BaseOS"     --baseurl=http://download.rockylinux.org/pub/rocky/8/Ba
 repo --name="AppStream"  --baseurl=http://download.rockylinux.org/pub/rocky/8/AppStream/aarch64/os/ --cost=200 --install
 repo --name="PowerTools" --baseurl=http://download.rockylinux.org/pub/rocky/8/BaseOS/aarch64/os/ --cost=300 --install
 # Rocky Rpi kernel repo, we need a more permanent place for this:
-repo --name="Rpi-Kernel" --baseurl=http://skip.linuxdn.org/RockyRpi/Rpi-Kernel/ --cost=20
+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
 
 
 
@@ -49,10 +50,10 @@ vim
 bash-completion
 nano
 
-
+rocky-release-rpi
 raspberrypi2-firmware
 raspberrypi2-kernel4
-aarch64-img-extra-config
+
 
 %end
 
@@ -78,11 +79,9 @@ echo "rockylinux" | passwd --stdin  rocky
 # First, the all-important README :
 
 cat >/home/rocky/README << EOF
-== Rocky 8 Raspberry Pi Image (experimental) ==
+== Rocky 8 Raspberry Pi Image ==
 
-This is a minimal Rocky 8 install intended for Raspberry Pi 4 devices (architecture is aarch64).
-
-It may work on a Pi 3 , but that has not been tested.  We are looking for Rpi 3 owners to test if you'd like to try it.
+This is a Rocky 8 install intended for Raspberry Pi 3b and 4 devices (architecture is aarch64).
 
 This image WILL NOT WORK on a Raspberry Pi 1 or 2, we are 64-bit only, and have no support for 32-bit ARM processors.  Sorry :-/.
 
@@ -97,12 +96,19 @@ IMAGE NOTES / DIFFERENCES FROM STOCK ROCKY 8:
   - Partitions are 300 MB /boot , 512 MB swap, 2800 MB rootfs.  Requires a 4 GB or larger storage device to serve as your disk
 
 
+GROW YOUR PARTITION: 
 
-If you want to automatically resize your / partition, just type the following (as root user):
+If you want to automatically resize your root (/ ) partition, just type the following (as root user):
 sudo rootfs-expand
 
 It should fill your main rootfs partition to the end of the disk.
 
+
+
+Thanks for your interest on Rocky-on-Rpi, feel free to share your experience or contribute in our chat channel at:  https://chat.rockylinux.org/rocky-linux/channels/altarch  !
+
+-The Rocky Linux Team
+
 EOF
 
 
@@ -123,24 +129,6 @@ chmod 755 /home/rocky/fix-wifi-rpi4.sh
 chown -R rocky:rocky /home/rocky
 
 
-# Add rpi-kernel repo:
-cat >/etc/yum.repos.d/Rocky_Rpi_kernel.repo << 'EOF'
-# Raspberry Pi Kernel repository
-#
-# This is an additional repository that hosts special kernel builds to use for the Raspberry Pi
-# Currently in an unsigned, temporary location - should change soon!
-#
-# Kernel upstream source is pulled from:  https://git.centos.org/rpms/raspberrypi2
-#
-
-[Rocky_Rpi_Kernel]
-name=Rocky Linux 8 Raspberry Pi Kernel
-baseurl=http://skip.linuxdn.org/RockyRpi/Rpi-Kernel/
-gpgcheck=0
-enabled=1
-
-EOF
-
 # Cleanup before shipping an image
 
 # Remove ifcfg-link on pre generated images
diff --git a/Rocky8_Rpi4_mkimage.sh b/Rocky8_Rpi4_mkimage.sh
index efbdd1c..b899dee 100755
--- a/Rocky8_Rpi4_mkimage.sh
+++ b/Rocky8_Rpi4_mkimage.sh
@@ -23,6 +23,6 @@ mkdir -p "${OUTDIR}"
 
 # Actually create the image.  Our kickstart data should be in the same git repo as this script:
 # (This takes a while, especially building on an rpi.  Patience!)
-appliance-creator -v -c ./Rocky8_Rpi4.ks -n RockyRpi --version=20210626  --release=1 --vmem=2048 --vcpu=2 --no-compress -o "${OUTDIR}"
+appliance-creator -v -c ./Rocky8_Rpi4.ks -n RockyRpi --version=`date +"%Y%m%d"`  --release=1 --vmem=2048 --vcpu=2 --no-compress -o "${OUTDIR}"
 
-chown -R $SUDO_USER. "${OUTDIR}"
\ No newline at end of file
+chown -R $SUDO_USER. "${OUTDIR}"