diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh
index 084ad0c..6f6aab0 100644
--- a/spcd/bootstrap.sh
+++ b/spcd/bootstrap.sh
@@ -788,7 +788,6 @@ spcd_step__packages_set_repositories() {
             ;;
         "8")
             set -- \
-                "" \
                 "-ha" \
                 "-nfv" \
                 "-plus" \
@@ -796,13 +795,14 @@ spcd_step__packages_set_repositories() {
                 "-resilientstorage" \
                 "-rt" \
                 "-sap" \
-                "-saphana"
+                "-saphana" \
+                ""
             ;;
         *) ;;
         esac
         for spcd_spr__file in "${@}"; do
             spcd_os_sed "/etc/yum.repos.d/almalinux${spcd_spr__file}.repo" \
-                "|^mirrorlist|# mirrorlist|" \
+                "|^mirrorlist|#mirrorlist|" \
                 "|https://repo.almalinux.org|${SPCD_URL_ALMA}|" \
                 "|^# baseurl|baseurl|"
         done
@@ -827,17 +827,18 @@ deb ${SPCD_URL_DEBIAN}-security ${SPCD_OS_VERSION}-security main
 "
         ;;
     "${SPCD_OS_FEDORA}")
-        for spcd_spr__file in \
-            "fedora" \
-            "fedora-updates" \
-            "fedora-updates-testing"; do
-            spcd_os_sed "/etc/yum.repos.d/${spcd_spr__file}.repo" \
-                "|^metalink|# metalink|" "\
+        set -- \
+            "-updates-testing" \
+            "-updates" \
+            ""
+        for spcd_spr__file in "${@}"; do
+            spcd_os_sed "/etc/yum.repos.d/fedora${spcd_spr__file}.repo" \
+                "|^metalink|#metalink|" "\
 |http://download.example/pub/fedora/linux|${SPCD_URL_FEDORA}|" \
                 "|^#baseurl|baseurl|"
         done
         spcd_os_sed "/etc/yum.repos.d/fedora-cisco-openh264.repo" \
-            "|^enabled=1|# enabled=0|"
+            "|^enabled=1|#enabled=0|"
         ;;
     "${SPCD_OS_OPENSUSE}")
         set -- \
@@ -859,16 +860,16 @@ deb ${SPCD_URL_DEBIAN}-security ${SPCD_OS_VERSION}-security main
                 "|http://download.opensuse.org|${SPCD_URL_OPENSUSE}|"
         done
         spcd_os_sed "/etc/zypp/repos.d/repo-openh264.repo" \
-            "|^enabled=1|# enabled=0|"
+            "|^enabled=1|#enabled=0|"
         ;;
     "${SPCD_OS_ROCKY}")
         case "${SPCD_OS_VERSION}" in
         "9")
             set -- \
-                "rocky" \
                 "rocky-addons" \
                 "rocky-devel" \
-                "rocky-extras"
+                "rocky-extras" \
+                "rocky"
             ;;
         "8")
             # not Rocky-Media
@@ -890,7 +891,7 @@ deb ${SPCD_URL_DEBIAN}-security ${SPCD_OS_VERSION}-security main
         esac
         for spcd_spr__file in "${@}"; do
             spcd_os_sed "/etc/yum.repos.d/${spcd_spr__file}.repo" \
-                "|^mirrorlist|# mirrorlist|" \
+                "|^mirrorlist|#mirrorlist|" \
                 "|http://dl.rockylinux.org|${SPCD_URL_ROCKY}|" \
                 "|^#baseurl|baseurl|"
         done
@@ -1150,7 +1151,7 @@ spcd_step__install_packages() {
         [ -n "${SPCD_URL_EPEL}" ] && spcd_ip__epel="${SPCD_URL_EPEL}" ||
             spcd_ip__epel="https://dl.fedoraproject.org"
         spcd_os_sed "/etc/yum.repos.d/epel.repo" \
-            "|^metalink|# metalink|" \
+            "|^metalink|#metalink|" \
             "|https://download.example|${spcd_ip__epel}|" \
             "|^#baseurl|baseurl|"
         ;;