diff --git a/roles/openshift-apps/mirrormanager/templates/scan-primary-mirror.toml b/roles/openshift-apps/mirrormanager/templates/scan-primary-mirror.toml
index e728d77c48..d9b9654ca3 100644
--- a/roles/openshift-apps/mirrormanager/templates/scan-primary-mirror.toml
+++ b/roles/openshift-apps/mirrormanager/templates/scan-primary-mirror.toml
@@ -21,13 +21,21 @@ type="directory"
 url="/srv/pub/epel/"
 
 [[repository_mapping]]
-regex="^pub/epel/testing/\\d+(?:\\.\\d+)?/Everything/"
+regex="^pub/epel/testing/\\d+/Everything/"
 prefix="testing-epel"
 
 [[repository_mapping]]
-regex="^pub/epel/\\d+(?:\\.\\d+)?/Everything/"
+regex="^pub/epel/\\d+/Everything/"
 prefix="epel"
 
+[[repository_mapping]]
+regex="^pub/epel/testing/\\d+\\.\\d+/Everything/"
+prefix="epel-z-testing"
+
+[[repository_mapping]]
+regex="^pub/epel/\\d+\\.\\d+/Everything/"
+prefix="epel-z"
+
 [[repository_mapping]]
 regex="pub/epel/[\\d]/Modular/.*"
 prefix="epel-modular"