diff --git a/roles/configure-mirrors/tasks/mirror/CentOS-8.yaml b/roles/configure-mirrors/tasks/mirror/CentOS-8.yaml
index a9f51e244..6b210b29e 100644
--- a/roles/configure-mirrors/tasks/mirror/CentOS-8.yaml
+++ b/roles/configure-mirrors/tasks/mirror/CentOS-8.yaml
@@ -7,11 +7,11 @@
     owner: root
     src: "centos8/{{ zj_repo }}.j2"
   with_items:
-    - etc/yum.repos.d/CentOS-AppStream.repo
-    - etc/yum.repos.d/CentOS-Base.repo
-    - etc/yum.repos.d/CentOS-HA.repo
-    - etc/yum.repos.d/CentOS-Extras.repo
-    - etc/yum.repos.d/CentOS-PowerTools.repo
+    - etc/yum.repos.d/CentOS-Linux-AppStream.repo
+    - etc/yum.repos.d/CentOS-Linux-BaseOS.repo
+    - etc/yum.repos.d/CentOS-Linux-HighAvailability.repo
+    - etc/yum.repos.d/CentOS-Linux-Extras.repo
+    - etc/yum.repos.d/CentOS-Linux-PowerTools.repo
     - etc/yum.repos.d/epel.repo
   loop_control:
     loop_var: zj_repo
diff --git a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-AppStream.repo.j2 b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-AppStream.repo.j2
similarity index 67%
rename from roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-AppStream.repo.j2
rename to roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-AppStream.repo.j2
index 5941b4b27..1ab5df663 100644
--- a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-AppStream.repo.j2
+++ b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-AppStream.repo.j2
@@ -1,7 +1,7 @@
 # {{ ansible_managed }}
-[AppStream]
+[appstream]
 name=CentOS-$releasever - AppStream
 baseurl={{ package_mirror }}/$releasever/AppStream/$basearch/os/
 gpgcheck=1
 enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
\ No newline at end of file
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Base.repo.j2 b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-BaseOS.repo.j2
similarity index 79%
rename from roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Base.repo.j2
rename to roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-BaseOS.repo.j2
index 1437657b9..3d3ed2092 100644
--- a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Base.repo.j2
+++ b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-BaseOS.repo.j2
@@ -1,6 +1,6 @@
 # {{ ansible_managed }}
-[BaseOS]
-name=CentOS-$releasever - Base
+[baseos]
+name=CentOS-$releasever - BaseOS
 baseurl={{ package_mirror }}/$releasever/BaseOS/$basearch/os/
 gpgcheck=1
 enabled=1
diff --git a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Extras.repo.j2 b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-Extras.repo.j2
similarity index 100%
rename from roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Extras.repo.j2
rename to roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-Extras.repo.j2
diff --git a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-HA.repo.j2 b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-HighAvailability.repo.j2
similarity index 78%
rename from roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-HA.repo.j2
rename to roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-HighAvailability.repo.j2
index 9726d5ae8..9e2db6b36 100644
--- a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-HA.repo.j2
+++ b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-HighAvailability.repo.j2
@@ -1,6 +1,6 @@
 # {{ ansible_managed }}
-[HighAvailability]
-name=CentOS-$releasever - HA
+[ha]
+name=CentOS-$releasever - HighAvailability
 baseurl={{ package_mirror }}/$releasever/HighAvailability/$basearch/os/
 gpgcheck=1
 enabled=1
diff --git a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-PowerTools.repo.j2 b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-PowerTools.repo.j2
similarity index 94%
rename from roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-PowerTools.repo.j2
rename to roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-PowerTools.repo.j2
index b3a2c1b96..27e5ed8f7 100644
--- a/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-PowerTools.repo.j2
+++ b/roles/configure-mirrors/templates/centos8/etc/yum.repos.d/CentOS-Linux-PowerTools.repo.j2
@@ -1,5 +1,5 @@
 # {{ ansible_managed }}
-[PowerTools]
+[powertools]
 name=CentOS-$releasever - PowerTools
 baseurl={{ package_mirror }}/$releasever/PowerTools/$basearch/os/
 gpgcheck=1