diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-queens.repo b/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-queens.repo
index d3c802fb..a5f29099 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-queens.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-queens.repo
@@ -5,7 +5,7 @@
 
 [centos-openstack-queens]
 name=CentOS-7 - OpenStack queens
-baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-queens/
+baseurl=http://mirror.centos.org/centos/7/cloud/x86_64/openstack-queens/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
@@ -13,14 +13,14 @@ exclude=sip,PyQt4
 
 [centos-openstack-queens-test]
 name=CentOS-7 - OpenStack queens Testing
-baseurl=https://buildlogs.centos.org/centos/7/cloud/$basearch/openstack-queens/
+baseurl=https://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-queens/
 gpgcheck=0
 enabled=0
 exclude=sip,PyQt4
 
 [centos-openstack-queens-debuginfo]
 name=CentOS-7 - OpenStack queens - Debug
-baseurl=http://debuginfo.centos.org/centos/7/cloud/$basearch/
+baseurl=http://debuginfo.centos.org/centos/7/cloud/x86_64/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-rocky.repo b/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-rocky.repo
index cad336e6..560440e8 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-rocky.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-rocky.repo
@@ -5,7 +5,7 @@
 
 [centos-openstack-rocky]
 name=CentOS-7 - OpenStack rocky
-baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-rocky/
+baseurl=http://mirror.centos.org/centos/7/cloud/x86_64/openstack-rocky/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
@@ -13,14 +13,14 @@ exclude=sip,PyQt4
 
 [centos-openstack-rocky-test]
 name=CentOS-7 - OpenStack rocky Testing
-baseurl=https://buildlogs.centos.org/centos/7/cloud/$basearch/openstack-rocky/
+baseurl=https://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-rocky/
 gpgcheck=0
 enabled=0
 exclude=sip,PyQt4
 
 [centos-openstack-rocky-debuginfo]
 name=CentOS-7 - OpenStack rocky - Debug
-baseurl=http://debuginfo.centos.org/centos/7/cloud/$basearch/
+baseurl=http://debuginfo.centos.org/centos/7/cloud/x86_64/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-stein.repo b/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-stein.repo
index a32c02f0..7427329e 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-stein.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-stein.repo
@@ -5,7 +5,7 @@
 
 [centos-openstack-stein]
 name=CentOS-7 - OpenStack stein
-baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-stein/
+baseurl=http://mirror.centos.org/centos/7/cloud/x86_64/openstack-stein/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
@@ -13,14 +13,14 @@ exclude=sip,PyQt4
 
 [centos-openstack-stein-test]
 name=CentOS-7 - OpenStack stein Testing
-baseurl=https://buildlogs.centos.org/centos/7/cloud/$basearch/openstack-stein/
+baseurl=https://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-stein/
 gpgcheck=0
 enabled=0
 exclude=sip,PyQt4
 
 [centos-openstack-stein-debuginfo]
 name=CentOS-7 - OpenStack stein - Debug
-baseurl=http://debuginfo.centos.org/centos/7/cloud/$basearch/
+baseurl=http://debuginfo.centos.org/centos/7/cloud/x86_64/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-train.repo b/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-train.repo
index e0985c9a..e8cb1a28 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-train.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_CentOS-OpenStack-train.repo
@@ -5,7 +5,7 @@
 
 [centos-openstack-train]
 name=CentOS-7 - OpenStack train
-baseurl=http://mirror.centos.org/centos/7/cloud/$basearch/openstack-train/
+baseurl=http://mirror.centos.org/centos/7/cloud/x86_64/openstack-train/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
@@ -13,14 +13,14 @@ exclude=sip,PyQt4
 
 [centos-openstack-train-test]
 name=CentOS-7 - OpenStack train Testing
-baseurl=https://buildlogs.centos.org/centos/7/cloud/$basearch/openstack-train/
+baseurl=https://buildlogs.centos.org/centos/7/cloud/x86_64/openstack-train/
 gpgcheck=0
 enabled=0
 exclude=sip,PyQt4
 
 [centos-openstack-train-debuginfo]
 name=CentOS-7 - OpenStack train - Debug
-baseurl=http://debuginfo.centos.org/centos/7/cloud/$basearch/
+baseurl=http://debuginfo.centos.org/centos/7/cloud/x86_64/
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud