diff --git a/mangle/validate_repos b/mangle/validate_repos
index ecfd90e..07192f6 100755
--- a/mangle/validate_repos
+++ b/mangle/validate_repos
@@ -22,11 +22,14 @@ cleanup_repo () {
     # plus is actually 'rockyplus'. Others may as well(?)
     if [[ "${repo}" =~ ^(plus)$ ]]; then
         repo="rocky${repo}"
+
+    # nfv is actually 'NFV'
     elif [[ "${repo}" =~ ^(nfv)$ ]]; then
         repo="${repo^^}"
-    else
-        repo="${repo}"
     fi
+
+    # Everything has an 8 appended to it
+    repo="${repo}-8"
     return 0
 }
 
@@ -38,17 +41,18 @@ for repo in "${ALL_REPOS[@]}"; do
     # Print a nice header
     printf "================\n${repo}\n================\n"
     for arch in "${ARCHES[@]}" "source"; do
+        # Source is treated as its own architecture
         if [[ "${arch}" == "source" ]]; then
-            _repo="${repo}-8-source"
-        else
-            _repo="${repo}-8"
+            repo="${repo}-source"
         fi
 
-        result=$(curl -s "${MIRRORLIST_BASE}?repo=${_repo}&arch=${arch}&time&country=global")
+        # Get the normal repo/arch combinations
+        result=$(curl -s "${MIRRORLIST_BASE}?repo=${repo}&arch=${arch}&time&country=global")
         print_result
 
+        # x86 and a64 have 'debug' types, as well
         if [[ "${arch}" =~ ^(x86_|aarch)64$ ]]; then
-            result=$(curl -s "${MIRRORLIST_BASE}?repo=${_repo}-debug&arch=${arch}&time&country=global")
+            result=$(curl -s "${MIRRORLIST_BASE}?repo=${repo}-debug&arch=${arch}&time&country=global")
             print_result
         fi
     done