diff --git a/roles/mirrormanager/backend/files/umdl-required b/roles/mirrormanager/backend/files/umdl-required
index 516481b14b..7af8c7d1b1 100644
--- a/roles/mirrormanager/backend/files/umdl-required
+++ b/roles/mirrormanager/backend/files/umdl-required
@@ -26,9 +26,10 @@ elif [ "${1}" ==  "alt" ]; then
 	CATEGORY="Fedora Other"
 elif [ "${1}" ==  "fedora-secondary" ]; then
 	CATEGORY="Fedora Secondary Arches"
+	SCANNER="/usr/local/bin/scan-primary-mirror -d"
 elif [ "${1}" ==  "archive" ]; then
 	CATEGORY="Fedora Archive"
-	SCANNER="/usr/local/bin/scan-primary-mirror"
+	SCANNER="/usr/local/bin/scan-primary-mirror -d"
 elif [ "${1}" ==  "codecs" ]; then
 	CATEGORY="Fedora Codecs"
 	SCANNER="/usr/local/bin/scan-primary-mirror"
diff --git a/roles/mirrormanager/backend/templates/scan-primary-mirror.toml b/roles/mirrormanager/backend/templates/scan-primary-mirror.toml
index 3c6e5cf05b..1e4e11cc14 100644
--- a/roles/mirrormanager/backend/templates/scan-primary-mirror.toml
+++ b/roles/mirrormanager/backend/templates/scan-primary-mirror.toml
@@ -3,7 +3,7 @@ max_stale_days = 3
 excludes=[".*\\.snapshot", ".*/\\.~tmp~"]
 skip_paths_for_version=["pub/alt", "pub/archive"]
 test_paths=["/test/", "/stage/"]
-skip_repository_paths = ["Cloud", "Workstation", "Server", "drpms" ]
+skip_repository_paths = ["Cloud", "Workstation", "Server", "drpms", "releases/test" ]
 do_not_display_paths = ["_Beta"]
 
 [database]
@@ -102,23 +102,23 @@ type="directory"
 url="/srv/pub/archive/"
 
 [[repository_mapping]]
-regex="^pub/archive/fedora(-secondary)?(/linux)?/(core|releases|development)/(rawhide|[\\.\\d]+)/.*"
+regex="^pub/archive/fedora(-secondary)?(/linux)?/(core|releases|development)/([\\.\\d]+)/[^ME].*"
 prefix="fedora"
 
 [[repository_mapping]]
-regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/[\\.\\d]+/Everything/.*"
+regex="^pub/(archive/)?fedora(-secondary)?(/linux)?/updates/[\\.\\d]+/Everything/.*"
 prefix="updates-released"
 
 [[repository_mapping]]
-regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/[\\.\\d]+/Modular/.*"
+regex="^pub/(archive/)?fedora(-secondary)?(/linux)?/updates/[\\.\\d]+/Modular/.*"
 prefix="updates-released-modular"
 
 [[repository_mapping]]
-regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/testing/[\\.\\d]+/Everything/.*"
+regex="^pub/(archive/)?fedora(-secondary)?(/linux)?/updates/testing/[\\.\\d]+/Everything/.*"
 prefix="updates-testing"
 
 [[repository_mapping]]
-regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/testing/[\\.\\d]+/Modular/.*"
+regex="^pub/(archive/)?fedora(-secondary)?(/linux)?/updates/testing/[\\.\\d]+/Modular/.*"
 prefix="updates-testing-modular"
 
 # pre modular structure
@@ -129,3 +129,26 @@ prefix="updates-testing"
 [[repository_mapping]]
 regex="^pub/archive/fedora(-secondary)?(/linux)?/updates/([\\.\\d]+)/[^ME].*"
 prefix="updates-released"
+
+### Fedora Secondary Arches ###
+
+[[category]]
+name="Fedora Secondary Arches"
+type="directory"
+url="/srv/pub/fedora-secondary/"
+
+[[repository_mapping]]
+regex="^pub/(archive/)?fedora(-secondary)?(/linux)?/(releases|development)/([\\.\\d]+)/Everything/.*"
+prefix="fedora"
+
+[[repository_mapping]]
+regex="^pub/(archive/)?fedora(-secondary)?(/linux)?/(releases|development)/([\\.\\d]+)/Modular/.*"
+prefix="fedora-modular"
+
+[[repository_mapping]]
+regex="^pub/(archive/)?fedora(-secondary)?(/linux)?/development/rawhide/Everything/.*"
+prefix="rawhide"
+
+[[repository_mapping]]
+regex="^pub/(archive/)?fedora(-secondary)?(/linux)?/development/rawhide/Modular/.*"
+prefix="rawhide-modular"