diff --git a/Rocky-8-KDE.ks b/Rocky-8-KDE.ks
index 926f223..54c39c6 100644
--- a/Rocky-8-KDE.ks
+++ b/Rocky-8-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/8.7/BaseOS/$basearch/os/"
+repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200
+repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200
+repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200
+repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/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
diff --git a/Rocky-8-Workstation-Lite.ks b/Rocky-8-Workstation-Lite.ks
index 1275916..5c143e5 100644
--- a/Rocky-8-Workstation-Lite.ks
+++ b/Rocky-8-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/8.7/BaseOS/$basearch/os/"
+repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200
+repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200
+repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200
+repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os --cost=200
 # System timezone
 timezone US/Eastern
 # SELinux configuration
diff --git a/Rocky-8-Workstation-Mainline.ks b/Rocky-8-Workstation-Mainline.ks
index d4d0b69..e9958f6 100644
--- a/Rocky-8-Workstation-Mainline.ks
+++ b/Rocky-8-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/8.7/BaseOS/$basearch/os/ --cost=200
+repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200
+repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200
+repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/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/8.7/BaseOS/$basearch/os/"
 # System bootloader configuration
 bootloader --location=none
 # Clear the Master Boot Record
diff --git a/Rocky-8-Workstation.ks b/Rocky-8-Workstation.ks
index d007f33..acc57a2 100644
--- a/Rocky-8-Workstation.ks
+++ b/Rocky-8-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/8.7/BaseOS/$basearch/os/"
+repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200
+repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200
+repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200
+repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/extras/$basearch/os --cost=200
 # System timezone
 timezone US/Eastern
 # SELinux configuration
diff --git a/Rocky-8-XFCE.ks b/Rocky-8-XFCE.ks
index 8e4c6f6..18d2e95 100644
--- a/Rocky-8-XFCE.ks
+++ b/Rocky-8-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/8.7/BaseOS/$basearch/os/"
+repo --name="BaseOS" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/BaseOS/$basearch/os/ --cost=200
+repo --name="AppStream" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/ --cost=200
+repo --name="PowerTools" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/ --cost=200
+repo --name="extras" --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/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
diff --git a/live/8/prod/mainline/rocky-repo-mainline.ks b/live/8/prod/mainline/rocky-repo-mainline.ks
index 8157eec..10f6a5d 100644
--- a/live/8/prod/mainline/rocky-repo-mainline.ks
+++ b/live/8/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/8.7/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/
+repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/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/8.7/BaseOS/$basearch/os/
 #url --url=http://10.100.0.1/pub/deps
diff --git a/live/8/prod/rocky-repo-epel.ks b/live/8/prod/rocky-repo-epel.ks
index 8fe92a0..2608d6c 100644
--- a/live/8/prod/rocky-repo-epel.ks
+++ b/live/8/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/8.7/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/
+repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/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/8.7/BaseOS/$basearch/os/
 #url --url=http://10.100.0.1/pub/deps
diff --git a/live/8/prod/rocky-repo.ks b/live/8/prod/rocky-repo.ks
index 134bb27..0da5f4b 100644
--- a/live/8/prod/rocky-repo.ks
+++ b/live/8/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/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/8.7/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/AppStream/$basearch/os/
+repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/PowerTools/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/pub/rocky/8.7/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/pub/rocky/8.7/BaseOS/$basearch/os/
diff --git a/live/8/stage/mainline/rocky-repo-mainline.ks b/live/8/stage/mainline/rocky-repo-mainline.ks
index 9473d22..082abe9 100644
--- a/live/8/stage/mainline/rocky-repo-mainline.ks
+++ b/live/8/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/8.7/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/AppStream/$basearch/os/
+repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/PowerTools/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/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/8.7/BaseOS/$basearch/os/
 #url --url=http://10.100.0.1/pub/deps
diff --git a/live/8/stage/rocky-repo-epel.ks b/live/8/stage/rocky-repo-epel.ks
index a104f83..bd3b1fa 100644
--- a/live/8/stage/rocky-repo-epel.ks
+++ b/live/8/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/8.7/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/AppStream/$basearch/os/
+repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/PowerTools/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/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/8.7/BaseOS/$basearch/os/
 #url --url=http://10.100.0.1/pub/deps
diff --git a/live/8/stage/rocky-repo.ks b/live/8/stage/rocky-repo.ks
index 7d96b47..647dbc1 100644
--- a/live/8/stage/rocky-repo.ks
+++ b/live/8/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/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/8.7/BaseOS/$basearch/os/
+repo --name=AppStream --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/AppStream/$basearch/os/
+repo --name=PowerTools --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/PowerTools/$basearch/os/
+repo --name=extras --cost=200 --baseurl=http://dl.rockylinux.org/stg/rocky/8.7/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/stg/rocky/8.7/BaseOS/$basearch/os/