diff --git a/centos-mirror-tools/Dockerfile b/centos-mirror-tools/Dockerfile
index 29f74fca..eb1f4578 100644
--- a/centos-mirror-tools/Dockerfile
+++ b/centos-mirror-tools/Dockerfile
@@ -17,8 +17,7 @@ RUN yum install -y epel-release sudo vim-enhanced net-tools git \
         bind-utils && rm /etc/yum.repos.d/CentOS-Sources.repo \
         /etc/yum.repos.d/epel.repo
 
-COPY StarlingX.repo /etc/yum.repos.d
-COPY StarlingX_3rd.repo /etc/yum.repos.d
+COPY yum.repos.d/* /etc/yum.repos.d/
 COPY rpm-gpg-keys/* /etc/pki/rpm-gpg/
 
 RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY*
diff --git a/centos-mirror-tools/StarlingX.repo b/centos-mirror-tools/StarlingX.repo
deleted file mode 100644
index e14389f4..00000000
--- a/centos-mirror-tools/StarlingX.repo
+++ /dev/null
@@ -1,473 +0,0 @@
-
-#### VAULT AKA Unmaintained old Packages
-### see http://vault.centos.org/readme.txt
-### created by Brian Avery
-
-# 7.2.1511
-# 
-[Starlingx-C7.2.1511-cloud-newton]
-name=Starlingx-CentOS-7.2.1511 - Cloud-newton
-baseurl=http://vault.centos.org/7.2.1511/cloud/x86_64/openstack-newton/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.2.1511-cloud-newton-source]
-name=Starlingx-CentOS-7.2.1511 - Cloud-newton-source
-baseurl=http://vault.centos.org/7.2.1511/cloud/Source/openstack-newton/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.2.1511-extras]
-name=StarlingX-CentOS-7.2.1511 - extras
-baseurl=http://vault.centos.org/7.2.1511/extras/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.2.1511-extras-source]
-name=Starlingx-CentOS-7.2.1511 - extras-source
-baseurl=http://vault.centos.org/7.2.1511/extras/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.2.1511-os]
-name=Starlingx-CentOS-7.2.1511 - os
-baseurl=http://vault.centos.org/7.2.1511/os/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.2.1511-os-source]
-name=Starlingx-CentOS-7.2.1511 - os-source
-baseurl=http://vault.centos.org/7.2.1511/os/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.2.1511-updates]
-name=Starlingx-CentOS-7.2.1511 - updates
-baseurl=http://vault.centos.org/7.2.1511/updates/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.2.1511-updates-source]
-name=Starlingx-CentOS-7.2.1511 - updates-source
-baseurl=http://vault.centos.org/7.2.1511/updates/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.2.1511-virt-kvm]
-name=Starlingx-CentOS-7.2.1511 - virt-kvm
-baseurl=http://vault.centos.org/7.2.1511/virt/x86_64/kvm-common
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.2.1511-virt-kvm-source]
-name=Starlingx-CentOS-7.2.1511 - virt-kvm-source
-baseurl=http://vault.centos.org/7.2.1511/virt/Source/kvm-common
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-# 7.3.1611
-# 
-[Starlingx-C7.3.1611-cloud-newton]
-name=Starlingx-CentOS-7.3.1611 - Cloud-newton
-baseurl=http://vault.centos.org/7.3.1611/cloud/x86_64/openstack-newton/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-cloud-newton-source]
-name=Starlingx-CentOS-7.3.1611 - Cloud-newton-source
-baseurl=http://vault.centos.org/7.3.1611/cloud/Source/openstack-newton/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-cloud-pike]
-name=Starlingx-CentOS-7.3.1611 - Cloud-pike
-baseurl=http://vault.centos.org/7.3.1611/cloud/x86_64/openstack-pike/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-cloud-pike-source]
-name=Starlingx-CentOS-7.3.1611 - Cloud-pike-source
-baseurl=http://vault.centos.org/7.3.1611/cloud/Source/openstack-pike/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-extras]
-name=Starlingx-CentOS-7.3.1611 - extras
-baseurl=http://vault.centos.org/7.3.1611/extras/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-extras-source]
-name=Starlingx-CentOS-7.3.1611 - extras-source
-baseurl=http://vault.centos.org/7.3.1611/extras/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-os]
-name=Starlingx-CentOS-7.3.1611 - os
-baseurl=http://vault.centos.org/7.3.1611/os/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-os-source]
-name=Starlingx-CentOS-7.3.1611 - os-source
-baseurl=http://vault.centos.org/7.3.1611/os/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-rt]
-name=Starlingx-CentOS-7.3.1611 - rt
-baseurl=http://vault.centos.org/7.3.1611/rt/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-rt-source]
-name=Starlingx-CentOS-7.3.1611 - rt-source
-baseurl=http://vault.centos.org/7.3.1611/rt/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-# 7.3.1611-cr contains older versions of python and valgrind
-#
-[Starlingx-C7.3.1611-cr]
-name=Starlingx-CentOS-7.3.1611 - cr
-baseurl=http://vault.centos.org/centos/7.3.1611/cr/x86_64
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-updates]
-name=Starlingx-CentOS-7.3.1611 - updates
-baseurl=http://vault.centos.org/7.3.1611/updates/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-updates-source]
-name=Starlingx-CentOS-7.3.1611 - updates-source
-baseurl=http://vault.centos.org/7.3.1611/updates/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-virt-kvm]
-name=Starlingx-CentOS-7.3.1611 - virt-kvm
-baseurl=http://vault.centos.org/7.3.1611/virt/x86_64/kvm-common
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-virt-kvm-source]
-name=Starlingx-CentOS-7.3.1611 - virt-kvm-source
-baseurl=http://vault.centos.org/7.3.1611/virt/Source/kvm-common
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-virt-libvirt]
-name=Starlingx-CentOS-7.3.1611 - virt-libvirt
-baseurl=http://vault.centos.org/7.3.1611/virt/x86_64/libvirt-latest
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.3.1611-virt-libvirt-source]
-name=Starlingx-CentOS-7.3.1611 - virt-libvirt-source
-baseurl=http://vault.centos.org/7.3.1611/virt/Source/libvirt-latest
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-# 7.4.1708
-# 
-[Starlingx-C7.4.1708-cloud-newton]
-name=Starlingx-CentOS-7.4.1708 - Cloud-newton
-baseurl=http://vault.centos.org/7.4.1708/cloud/x86_64/openstack-newton/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[Starlingx-C7.4.1708-cloud-newton-source]
-name=Starlingx-CentOS-7.4.1708 - Cloud-newton-source
-baseurl=http://vault.centos.org/7.4.1708/cloud/Source/openstack-newton/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.4.1708-cloud-pike]
-name=Starlingx-CentOS-7.4.1708 - Cloud-pike
-baseurl=http://vault.centos.org/7.4.1708/cloud/x86_64/openstack-pike/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[Starlingx-C7.4.1708-cloud-pike-source]
-name=Starlingx-CentOS-7.4.1708 - Cloud-pike-source
-baseurl=http://vault.centos.org/7.4.1708/cloud/Source/openstack-pike/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.4.1708-cloud-queens-source]
-name=Starlingx-CentOS-7.4.1708 - Cloud-queens-source
-baseurl=http://vault.centos.org/7.4.1708/cloud/Source/openstack-queens/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.4.1708-extras]
-name=Starlingx-CentOS-7.4.1708 - extras
-baseurl=http://vault.centos.org/7.4.1708/extras/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[Starlingx-C7.4.1708-extras-source]
-name=Starlingx-CentOS-7.4.1708 - extras-source
-baseurl=http://vault.centos.org/7.4.1708/extras/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.4.1708-os]
-name=Starlingx-CentOS-7.4.1708 - os
-baseurl=http://vault.centos.org/7.4.1708/os/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[Starlingx-C7.4.1708-os-source]
-name=Starlingx-CentOS-7.4.1708 - os-source
-baseurl=http://vault.centos.org/7.4.1708/os/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.4.1708-rt]
-name=Starlingx-CentOS-7.4.1708 - rt
-baseurl=http://vault.centos.org/7.4.1708/rt/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[Starlingx-C7.4.1708-rt-source]
-name=Starlingx-CentOS-7.4.1708 - rt-source
-baseurl=http://vault.centos.org/7.4.1708/rt/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-
-
-[Starlingx-C7.4.1708-updates]
-name=Starlingx-CentOS-7.4.1708 - updates
-baseurl=http://vault.centos.org/7.4.1708/updates/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[Starlingx-C7.4.1708-updates-source]
-name=Starlingx-CentOS-7.4.1708 - updates-source
-baseurl=http://vault.centos.org/7.4.1708/updates/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.4.1708-virt-kvm]
-name=Starlingx-CentOS-7.4.1708 - virt-kvm
-baseurl=http://vault.centos.org/7.4.1708/virt/x86_64/kvm-common
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[Starlingx-C7.4.1708-virt-kvm-source]
-name=Starlingx-CentOS-7.4.1708 - virt-kvm-source
-baseurl=http://vault.centos.org/7.4.1708/virt/Source/kvm-common
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.4.1708-virt-libvirt]
-name=Starlingx-CentOS-7.4.1708 - virt-libvirt
-baseurl=http://vault.centos.org/7.4.1708/virt/x86_64/libvirt-latest
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[Starlingx-C7.4.1708-virt-libvirt-source]
-name=Starlingx-CentOS-7.4.1708 - virt-libvirt-source
-baseurl=http://vault.centos.org/7.4.1708/virt/Source/libvirt-latest
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-########
-# 7.5.1804
-#
-[Starlingx-C7.5.1804-cloud-pike]
-name=Starlingx-CentOS-7.5.1804 - Cloud-pike
-baseurl=http://mirror.centos.org/centos/7.5.1804/cloud/x86_64/openstack-pike/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.5.1804-cloud-pike-source]
-name=Starlingx-CentOS-7.5.1804 - Cloud-pike-source
-baseurl=http://vault.centos.org/7.5.1804/cloud/Source/openstack-pike/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.5.1804-extras]
-name=Starlingx-CentOS-7.5.1804 - extras
-baseurl=http://mirror.centos.org/centos/7.5.1804/extras/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.5.1804-extras-source]
-name=Starlingx-CentOS-7.5.1804 - extras-source
-baseurl=http://vault.centos.org/7.5.1804/extras/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.5.1804-os]
-name=Starlingx-CentOS-7.5.1804 - os
-baseurl=http://mirror.centos.org/centos/7.5.1804/os/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.5.1804-os-source]
-name=Starlingx-CentOS-7.5.1804 - os-source
-baseurl=http://vault.centos.org/7.5.1804/os/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.5.1804-rt]
-name=Starlingx-CentOS-7.5.1804 - rt
-baseurl=http://mirror.centos.org/centos/7.5.1804/rt/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-# not available, might be updated later
-# [Starlingx-C7.5.1804-rt-source]
-# name=Starlingx-CentOS-7.5.1804 - rt-source
-# baseurl=http://vault.centos.org/7.5.1804/rt/Source/
-# gpgcheck=1
-# gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-# enabled=1
-
-[Starlingx-C7.5.1804-updates]
-name=Starlingx-CentOS-7.5.1804 - updates
-baseurl=http://mirror.centos.org/centos/7.5.1804/updates/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.5.1804-updates-source]
-name=Starlingx-CentOS-7.5.1804 - updates-source
-baseurl=http://vault.centos.org/7.5.1804/updates/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.5.1804-virt-kvm]
-name=Starlingx-CentOS-7.5.1804 - virt-kvm
-baseurl=http://mirror.centos.org/centos/7.5.1804/virt/x86_64/kvm-common
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.5.1804-virt-kvm-source]
-name=Starlingx-CentOS-7.5.1804 - virt-kvm-source
-baseurl=http://vault.centos.org/7.5.1804/virt/Source/kvm-common
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-C7.5.1804-virt-libvirt]
-name=Starlingx-CentOS-7.5.1804 - virt-libvirt
-baseurl=http://mirror.centos.org/centos/7.5.1804/virt/x86_64/libvirt-latest
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=0
-
-[Starlingx-C7.5.1804-virt-libvirt-source]
-name=Starlingx-CentOS-7.5.1804 - virt-libvirt-source
-baseurl=http://vault.centos.org/7.5.1804/virt/Source/libvirt-latest
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-########
-#### EPEL - 
-
-[Starlingx-epel-7]
-name=Starlingx-Epel-7
-baseurl=https://dl.fedoraproject.org/pub/epel/7/x86_64/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
-enabled=1
-
-[Starlingx-epel-7-debug]
-name=Starlingx-Epel-7-debug
-baseurl=https://dl.fedoraproject.org/pub/epel/7/x86_64/debug
-gpgcheck=0
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-
-[Starlingx-epel-7-source]
-name=Starlingx-Epel-7-source
-baseurl=https://dl.fedoraproject.org/pub/epel/7/SRPMS/
-gpgcheck=0
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-
-[Starlingx-epel-7-testing]
-name=Starlingx-Epel-7
-baseurl=https://dl.fedoraproject.org/pub/epel/testing/7/x86_64/
-gpgcheck=0
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-epel-7-testing-debug]
-name=Starlingx-Epel-7
-baseurl=https://dl.fedoraproject.org/pub/epel/testing/7/x86_64/debug/
-gpgcheck=0
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-[Starlingx-epel-7-testing-source]
-name=Starlingx-Epel-7-source
-baseurl=https://dl.fedoraproject.org/pub/epel/testing/7/SRPMS/
-gpgcheck=0
-#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
-enabled=1
-
-
diff --git a/centos-mirror-tools/StarlingX_3rd.repo b/centos-mirror-tools/StarlingX_3rd.repo
deleted file mode 100644
index d9c5b37a..00000000
--- a/centos-mirror-tools/StarlingX_3rd.repo
+++ /dev/null
@@ -1,68 +0,0 @@
-[Starlingx-vault]
-name=Starlingx-vault.centos.org.centos.7.updates.Source - vault.centos.org.centos.7.updates.Source
-baseurl=http://vault.centos.org/centos/7/updates/Source
-enabled=1
-
-[Starlingx-buildlogs-seed.centos.org_c7.1708.00]
-name=Starlingx-buildlogs-seed.centos.org_c7.1708.00 - buildlogs-seed.centos.org_c7.1708.00
-baseurl=http://buildlogs-seed.centos.org/c7.1708.00
-enabled=1
-
-[Starlingx-epel.blizoo.mk_epel_7Server_x86_64]
-name=Starlingx-epel.blizoo.mk_epel_7Server_x86_64 - epel.blizoo.mk_epel_7Server_x86_64
-baseurl=http://epel.blizoo.mk/epel/7Server/x86_64
-enabled=1
-
-[Starlingx-epel.blizoo.mk_epel_7_SRPMS]
-name=Starlingx-epel.blizoo.mk_epel_7_SRPMS - epel.blizoo.mk_epel_7_SRPMS
-baseurl=http://epel.blizoo.mk/epel/7/SRPMS
-enabled=1
-
-[Starlingx-ftp.iij.ad.jp_pub_linux_centos_7_rt_x86_64]
-name=Starlingx-ftp.iij.ad.jp_pub_linux_centos_7_rt_x86_64 - ftp.iij.ad.jp_pub_linux_centos_7_rt_x86_64
-baseurl=http://ftp.iij.ad.jp/pub/linux/centos/7/rt/x86_64
-enabled=1
-
-[Starlingx-ftp.riken.jp_Linux_cern_centos_7_rt_Sources]
-name=Starlingx-ftp.riken.jp_Linux_cern_centos_7_rt_Sources - ftp.riken.jp_Linux_cern_centos_7_rt_Sources
-baseurl=http://ftp.riken.jp/Linux/cern/centos/7/rt/Sources
-enabled=1
-
-[Starlingx-mirror.centos.org_centos_7_cloud_x86_64_openstack-pike]
-name=Starlingx-mirror.centos.org_centos_7_cloud_x86_64_openstack-pike - mirror.centos.org_centos_7_cloud_x86_64_openstack-pike
-baseurl=http://mirror.centos.org/centos/7/cloud/x86_64/openstack-pike
-enabled=1
-
-[Starlingx-mirrors.isu.net.sa_pub_fedora_fedora-epel_7Server_x86_64]
-name=Starlingx-mirrors.isu.net.sa_pub_fedora_fedora-epel_7Server_x86_64 - mirrors.isu.net.sa_pub_fedora_fedora-epel_7Server_x86_64
-baseurl=http://mirrors.isu.net.sa/pub/fedora/fedora-epel/7Server/x86_64
-enabled=1
-
-[Starlingx-mirrors.isu.net.sa_pub_fedora_fedora-epel_7_SRPMS]
-name=Starlingx-mirrors.isu.net.sa_pub_fedora_fedora-epel_7_SRPMS - mirrors.isu.net.sa_pub_fedora_fedora-epel_7_SRPMS
-baseurl=http://mirrors.isu.net.sa/pub/fedora/fedora-epel/7/SRPMS
-enabled=1
-
-[Starlingx-buildlogs.centos.org_c7.1708.u.i386]
-name=Starlingx-buildlogs.centos.org_c7.1708.u.i386 - buildlogs.centos.org_c7.1708.u.i386
-baseurl=https://buildlogs.centos.org/c7.1708.u.i386
-enabled=1
-
-[Starlingx-download.docker.com_linux_centos_7_source_stable]
-name=Starlingx-download.docker.com_linux_centos_7_source_stable - download.docker.com_linux_centos_7_source_stable
-baseurl=https://download.docker.com/linux/centos/7/source/stable
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-DOCKER
-enabled=1
-
-[Starlingx-download.docker.com_linux_centos_7_x86_64_stable]
-name=Starlingx-download.docker.com_linux_centos_7_x86_64_stable - download.docker.com_linux_centos_7_x86_64_stable
-baseurl=https://download.docker.com/linux/centos/7/x86_64/stable
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-DOCKER
-enabled=1
-
-[Starlingx-www.rpmfind.net_linux_epel_7_x86_64]
-name=Starlingx-www.rpmfind.net_linux_epel_7_x86_64 - www.rpmfind.net_linux_epel_7_x86_64
-baseurl=https://www.rpmfind.net/linux/epel/7/x86_64
-enabled=1
diff --git a/centos-mirror-tools/download_mirror.sh b/centos-mirror-tools/download_mirror.sh
index cced3322..492fadff 100755
--- a/centos-mirror-tools/download_mirror.sh
+++ b/centos-mirror-tools/download_mirror.sh
@@ -18,6 +18,14 @@ if [ ! -e ./rpms_from_3rd_parties.lst ];then
     echo "ERROR: ./rpms_from_3rd_parties.lst does NOT exist!!"
     exit -1
 fi
+
+# Restore StarlingX_3rd repos from backup
+REPO_SOURCE_DIR=/localdisk/yum.repos.d
+REPO_DIR=/etc/yum.repos.d
+if [ -d $REPO_SOURCE_DIR ] && [ -d $REPO_DIR ]; then
+    \cp -f $REPO_SOURCE_DIR/*.repo $REPO_DIR/
+fi
+
 $rpm_downloader ./rpms_from_3rd_parties.lst L1 3rd | tee ./logs/log_download_rpms_from_3rd_party.txt
 if [ $? != 0 ];then
     echo "ERROR: something wrong with downloading, please check the log!!"
@@ -25,8 +33,9 @@ fi
 
 # download RPMs/SRPMs from 3rd_party repos by "yumdownloader"
 $rpm_downloader ./rpms_from_centos_3rd_parties.lst L1 3rd-centos | tee ./logs/log_download_rpms_from_centos_3rd_parties_L1.txt
+
 # deleting the StarlingX_3rd to avoid pull centos packages from the 3rd Repo.
-rm -f /etc/yum.repos.d/StarlingX_3rd.repo
+\rm -f $REPO_DIR/StarlingX_3rd*.repo
 
 echo "step #2: start 1st round of downloading RPMs and SRPMs with L1 match criteria..."
 #download RPMs/SRPMs from CentOS repos by "yumdownloader"
diff --git a/centos-mirror-tools/starlingx_add_pkgs.sh b/centos-mirror-tools/starlingx_add_pkgs.sh
index 894a6643..35b96585 100755
--- a/centos-mirror-tools/starlingx_add_pkgs.sh
+++ b/centos-mirror-tools/starlingx_add_pkgs.sh
@@ -85,8 +85,9 @@ if [ -z "$MY_REPO_ROOT_DIR" ]; then
 fi
 
 STXTOOLS=${MY_REPO_ROOT_DIR}/stx-tools
-REPOCFG_STD_FILES=$(ls ${STXTOOLS}/centos-mirror-tools/StarlingX*.repo | grep -v StarlingX_3rd)
-REPOCFG_3RD_FILES=${STXTOOLS}/centos-mirror-tools/StarlingX_3rd*.repo
+REPO_DIR=${STXTOOLS}/centos-mirror-tools/yum.repos.d
+REPOCFG_STD_FILES=$(ls ${REPO_DIR}/StarlingX*.repo | grep -v StarlingX_3rd)
+REPOCFG_3RD_FILES=${REPO_DIR}/StarlingX_3rd*.repo
 REPOCFG_STD_MERGED=$(mktemp /tmp/REPOCFG_STD_MERGED_XXXXXX)
 cat $REPOCFG_STD_FILES > $REPOCFG_STD_MERGED
 REPOCFG_3RD_MERGED=$(mktemp /tmp/REPOCFG_3RD_MERGED_XXXXXX)
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.2.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.2.repo
new file mode 100644
index 00000000..681d965d
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.2.repo
@@ -0,0 +1,79 @@
+#####
+# Centos 7.2.1511
+# 
+[Starlingx-C7.2.1511-cloud-newton]
+name=Starlingx-CentOS-7.2.1511 - Cloud-newton
+baseurl=http://vault.centos.org/7.2.1511/cloud/x86_64/openstack-newton/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.2.1511-cloud-newton-source]
+name=Starlingx-CentOS-7.2.1511 - Cloud-newton-source
+baseurl=http://vault.centos.org/7.2.1511/cloud/Source/openstack-newton/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.2.1511-extras]
+name=StarlingX-CentOS-7.2.1511 - extras
+baseurl=http://vault.centos.org/7.2.1511/extras/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.2.1511-extras-source]
+name=Starlingx-CentOS-7.2.1511 - extras-source
+baseurl=http://vault.centos.org/7.2.1511/extras/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.2.1511-os]
+name=Starlingx-CentOS-7.2.1511 - os
+baseurl=http://vault.centos.org/7.2.1511/os/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.2.1511-os-source]
+name=Starlingx-CentOS-7.2.1511 - os-source
+baseurl=http://vault.centos.org/7.2.1511/os/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.2.1511-updates]
+name=Starlingx-CentOS-7.2.1511 - updates
+baseurl=http://vault.centos.org/7.2.1511/updates/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.2.1511-updates-source]
+name=Starlingx-CentOS-7.2.1511 - updates-source
+baseurl=http://vault.centos.org/7.2.1511/updates/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.2.1511-virt-kvm]
+name=Starlingx-CentOS-7.2.1511 - virt-kvm
+baseurl=http://vault.centos.org/7.2.1511/virt/x86_64/kvm-common
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.2.1511-virt-kvm-source]
+name=Starlingx-CentOS-7.2.1511 - virt-kvm-source
+baseurl=http://vault.centos.org/7.2.1511/virt/Source/kvm-common
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.2.1511-cr]
+name=Starlingx-CentOS-7.2.1511 - cr
+baseurl=http://vault.centos.org/centos/7.2.1511/cr/x86_64
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.3.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.3.repo
new file mode 100644
index 00000000..dbb36fb6
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.3.repo
@@ -0,0 +1,125 @@
+####
+# Centos 7.3.1611
+# 
+[Starlingx-C7.3.1611-cloud-newton]
+name=Starlingx-CentOS-7.3.1611 - Cloud-newton
+baseurl=http://vault.centos.org/7.3.1611/cloud/x86_64/openstack-newton/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-cloud-newton-source]
+name=Starlingx-CentOS-7.3.1611 - Cloud-newton-source
+baseurl=http://vault.centos.org/7.3.1611/cloud/Source/openstack-newton/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-cloud-pike]
+name=Starlingx-CentOS-7.3.1611 - Cloud-pike
+baseurl=http://vault.centos.org/7.3.1611/cloud/x86_64/openstack-pike/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-cloud-pike-source]
+name=Starlingx-CentOS-7.3.1611 - Cloud-pike-source
+baseurl=http://vault.centos.org/7.3.1611/cloud/Source/openstack-pike/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-extras]
+name=Starlingx-CentOS-7.3.1611 - extras
+baseurl=http://vault.centos.org/7.3.1611/extras/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-extras-source]
+name=Starlingx-CentOS-7.3.1611 - extras-source
+baseurl=http://vault.centos.org/7.3.1611/extras/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-os]
+name=Starlingx-CentOS-7.3.1611 - os
+baseurl=http://vault.centos.org/7.3.1611/os/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-os-source]
+name=Starlingx-CentOS-7.3.1611 - os-source
+baseurl=http://vault.centos.org/7.3.1611/os/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-rt]
+name=Starlingx-CentOS-7.3.1611 - rt
+baseurl=http://vault.centos.org/7.3.1611/rt/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-rt-source]
+name=Starlingx-CentOS-7.3.1611 - rt-source
+baseurl=http://vault.centos.org/7.3.1611/rt/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+
+
+[Starlingx-C7.3.1611-updates]
+name=Starlingx-CentOS-7.3.1611 - updates
+baseurl=http://vault.centos.org/7.3.1611/updates/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-updates-source]
+name=Starlingx-CentOS-7.3.1611 - updates-source
+baseurl=http://vault.centos.org/7.3.1611/updates/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-virt-kvm]
+name=Starlingx-CentOS-7.3.1611 - virt-kvm
+baseurl=http://vault.centos.org/7.3.1611/virt/x86_64/kvm-common
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-virt-kvm-source]
+name=Starlingx-CentOS-7.3.1611 - virt-kvm-source
+baseurl=http://vault.centos.org/7.3.1611/virt/Source/kvm-common
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-virt-libvirt]
+name=Starlingx-CentOS-7.3.1611 - virt-libvirt
+baseurl=http://vault.centos.org/7.3.1611/virt/x86_64/libvirt-latest
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.3.1611-virt-libvirt-source]
+name=Starlingx-CentOS-7.3.1611 - virt-libvirt-source
+baseurl=http://vault.centos.org/7.3.1611/virt/Source/libvirt-latest
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+# 7.3.1611-cr contains older versions of python and valgrind
+[Starlingx-C7.3.1611-cr]
+name=Starlingx-CentOS-7.3.1611 - cr
+baseurl=http://vault.centos.org/centos/7.3.1611/cr/x86_64
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.4.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.4.repo
new file mode 100644
index 00000000..d8e16b34
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.4.repo
@@ -0,0 +1,131 @@
+####
+# Centos 7.4.1708
+# 
+[Starlingx-C7.4.1708-cloud-newton]
+name=Starlingx-CentOS-7.4.1708 - Cloud-newton
+baseurl=http://vault.centos.org/7.4.1708/cloud/x86_64/openstack-newton/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[Starlingx-C7.4.1708-cloud-newton-source]
+name=Starlingx-CentOS-7.4.1708 - Cloud-newton-source
+baseurl=http://vault.centos.org/7.4.1708/cloud/Source/openstack-newton/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.4.1708-cloud-pike]
+name=Starlingx-CentOS-7.4.1708 - Cloud-pike
+baseurl=http://vault.centos.org/7.4.1708/cloud/x86_64/openstack-pike/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[Starlingx-C7.4.1708-cloud-pike-source]
+name=Starlingx-CentOS-7.4.1708 - Cloud-pike-source
+baseurl=http://vault.centos.org/7.4.1708/cloud/Source/openstack-pike/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.4.1708-cloud-queens-source]
+name=Starlingx-CentOS-7.4.1708 - Cloud-queens-source
+baseurl=http://vault.centos.org/7.4.1708/cloud/Source/openstack-queens/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.4.1708-extras]
+name=Starlingx-CentOS-7.4.1708 - extras
+baseurl=http://vault.centos.org/7.4.1708/extras/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[Starlingx-C7.4.1708-extras-source]
+name=Starlingx-CentOS-7.4.1708 - extras-source
+baseurl=http://vault.centos.org/7.4.1708/extras/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.4.1708-os]
+name=Starlingx-CentOS-7.4.1708 - os
+baseurl=http://vault.centos.org/7.4.1708/os/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[Starlingx-C7.4.1708-os-source]
+name=Starlingx-CentOS-7.4.1708 - os-source
+baseurl=http://vault.centos.org/7.4.1708/os/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.4.1708-rt]
+name=Starlingx-CentOS-7.4.1708 - rt
+baseurl=http://vault.centos.org/7.4.1708/rt/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[Starlingx-C7.4.1708-rt-source]
+name=Starlingx-CentOS-7.4.1708 - rt-source
+baseurl=http://vault.centos.org/7.4.1708/rt/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+
+
+[Starlingx-C7.4.1708-updates]
+name=Starlingx-CentOS-7.4.1708 - updates
+baseurl=http://vault.centos.org/7.4.1708/updates/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[Starlingx-C7.4.1708-updates-source]
+name=Starlingx-CentOS-7.4.1708 - updates-source
+baseurl=http://vault.centos.org/7.4.1708/updates/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.4.1708-virt-kvm]
+name=Starlingx-CentOS-7.4.1708 - virt-kvm
+baseurl=http://vault.centos.org/7.4.1708/virt/x86_64/kvm-common
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[Starlingx-C7.4.1708-virt-kvm-source]
+name=Starlingx-CentOS-7.4.1708 - virt-kvm-source
+baseurl=http://vault.centos.org/7.4.1708/virt/Source/kvm-common
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.4.1708-virt-libvirt]
+name=Starlingx-CentOS-7.4.1708 - virt-libvirt
+baseurl=http://vault.centos.org/7.4.1708/virt/x86_64/libvirt-latest
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[Starlingx-C7.4.1708-virt-libvirt-source]
+name=Starlingx-CentOS-7.4.1708 - virt-libvirt-source
+baseurl=http://vault.centos.org/7.4.1708/virt/Source/libvirt-latest
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.4.1708-cr]
+name=Starlingx-CentOS-7.4.1708 - cr
+baseurl=http://vault.centos.org/centos/7.4.1708/cr/x86_64
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.5.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.5.repo
new file mode 100644
index 00000000..925486cd
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.5.repo
@@ -0,0 +1,102 @@
+########
+# Centos 7.5.1804
+#
+[Starlingx-C7.5.1804-cloud-pike]
+name=Starlingx-CentOS-7.5.1804 - Cloud-pike
+baseurl=http://mirror.centos.org/centos/7.5.1804/cloud/x86_64/openstack-pike/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.5.1804-cloud-pike-source]
+name=Starlingx-CentOS-7.5.1804 - Cloud-pike-source
+baseurl=http://vault.centos.org/7.5.1804/cloud/Source/openstack-pike/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.5.1804-extras]
+name=Starlingx-CentOS-7.5.1804 - extras
+baseurl=http://mirror.centos.org/centos/7.5.1804/extras/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.5.1804-extras-source]
+name=Starlingx-CentOS-7.5.1804 - extras-source
+baseurl=http://vault.centos.org/7.5.1804/extras/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.5.1804-os]
+name=Starlingx-CentOS-7.5.1804 - os
+baseurl=http://mirror.centos.org/centos/7.5.1804/os/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.5.1804-os-source]
+name=Starlingx-CentOS-7.5.1804 - os-source
+baseurl=http://vault.centos.org/7.5.1804/os/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.5.1804-rt]
+name=Starlingx-CentOS-7.5.1804 - rt
+baseurl=http://mirror.centos.org/centos/7.5.1804/rt/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+# not available, might be updated later
+# [Starlingx-C7.5.1804-rt-source]
+# name=Starlingx-CentOS-7.5.1804 - rt-source
+# baseurl=http://vault.centos.org/7.5.1804/rt/Source/
+# gpgcheck=1
+# gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+# enabled=1
+
+[Starlingx-C7.5.1804-updates]
+name=Starlingx-CentOS-7.5.1804 - updates
+baseurl=http://mirror.centos.org/centos/7.5.1804/updates/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.5.1804-updates-source]
+name=Starlingx-CentOS-7.5.1804 - updates-source
+baseurl=http://vault.centos.org/7.5.1804/updates/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.5.1804-virt-kvm]
+name=Starlingx-CentOS-7.5.1804 - virt-kvm
+baseurl=http://mirror.centos.org/centos/7.5.1804/virt/x86_64/kvm-common
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.5.1804-virt-kvm-source]
+name=Starlingx-CentOS-7.5.1804 - virt-kvm-source
+baseurl=http://vault.centos.org/7.5.1804/virt/Source/kvm-common
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-C7.5.1804-virt-libvirt]
+name=Starlingx-CentOS-7.5.1804 - virt-libvirt
+baseurl=http://mirror.centos.org/centos/7.5.1804/virt/x86_64/libvirt-latest
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[Starlingx-C7.5.1804-virt-libvirt-source]
+name=Starlingx-CentOS-7.5.1804 - virt-libvirt-source
+baseurl=http://vault.centos.org/7.5.1804/virt/Source/libvirt-latest
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX-EPEL-7.repo b/centos-mirror-tools/yum.repos.d/StarlingX-EPEL-7.repo
new file mode 100644
index 00000000..47150272
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-EPEL-7.repo
@@ -0,0 +1,48 @@
+########
+#### EPEL 7 
+
+[Starlingx-epel-7]
+name=Starlingx-Epel-7
+baseurl=https://dl.fedoraproject.org/pub/epel/7/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7
+enabled=1
+
+[Starlingx-epel-7-debug]
+name=Starlingx-Epel-7-debug
+baseurl=https://dl.fedoraproject.org/pub/epel/7/x86_64/debug
+gpgcheck=0
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+
+[Starlingx-epel-7-source]
+name=Starlingx-Epel-7-source
+baseurl=https://dl.fedoraproject.org/pub/epel/7/SRPMS/
+gpgcheck=0
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+
+[Starlingx-epel-7-testing]
+name=Starlingx-Epel-7
+baseurl=https://dl.fedoraproject.org/pub/epel/testing/7/x86_64/
+gpgcheck=0
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-epel-7-testing-debug]
+name=Starlingx-Epel-7
+baseurl=https://dl.fedoraproject.org/pub/epel/testing/7/x86_64/debug/
+gpgcheck=0
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[Starlingx-epel-7-testing-source]
+name=Starlingx-Epel-7-source
+baseurl=https://dl.fedoraproject.org/pub/epel/testing/7/SRPMS/
+gpgcheck=0
+#gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_buildlogs-seed_centos_org.repo b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_buildlogs-seed_centos_org.repo
new file mode 100644
index 00000000..800704cc
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_buildlogs-seed_centos_org.repo
@@ -0,0 +1,7 @@
+#####
+# buildlogs-seed.centos.org
+
+[Starlingx-buildlogs-seed.centos.org_c7.1708.00]
+name=Starlingx-buildlogs-seed.centos.org_c7.1708.00 - buildlogs-seed.centos.org_c7.1708.00
+baseurl=http://buildlogs-seed.centos.org/c7.1708.00
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_buildlogs_centos_org.repo b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_buildlogs_centos_org.repo
new file mode 100644
index 00000000..65cbf02f
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_buildlogs_centos_org.repo
@@ -0,0 +1,7 @@
+#####
+# buildlogs.centos.org
+
+[Starlingx-buildlogs.centos.org_c7.1708.u.i386]
+name=Starlingx-buildlogs.centos.org_c7.1708.u.i386 - buildlogs.centos.org_c7.1708.u.i386
+baseurl=https://buildlogs.centos.org/c7.1708.u.i386
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_download_docker_com.repo b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_download_docker_com.repo
new file mode 100644
index 00000000..117df174
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_download_docker_com.repo
@@ -0,0 +1,16 @@
+#####
+# download.docker.com
+
+[Starlingx-download.docker.com_linux_centos_7_source_stable]
+name=Starlingx-download.docker.com_linux_centos_7_source_stable - download.docker.com_linux_centos_7_source_stable
+baseurl=https://download.docker.com/linux/centos/7/source/stable
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-DOCKER
+enabled=1
+
+[Starlingx-download.docker.com_linux_centos_7_x86_64_stable]
+name=Starlingx-download.docker.com_linux_centos_7_x86_64_stable - download.docker.com_linux_centos_7_x86_64_stable
+baseurl=https://download.docker.com/linux/centos/7/x86_64/stable
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-DOCKER
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_epel_blizoo_mk.repo b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_epel_blizoo_mk.repo
new file mode 100644
index 00000000..3a66c086
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_epel_blizoo_mk.repo
@@ -0,0 +1,12 @@
+#####
+# epel.blizoo.mk
+
+[Starlingx-epel.blizoo.mk_epel_7Server_x86_64]
+name=Starlingx-epel.blizoo.mk_epel_7Server_x86_64 - epel.blizoo.mk_epel_7Server_x86_64
+baseurl=http://epel.blizoo.mk/epel/7Server/x86_64
+enabled=1
+
+[Starlingx-epel.blizoo.mk_epel_7_SRPMS]
+name=Starlingx-epel.blizoo.mk_epel_7_SRPMS - epel.blizoo.mk_epel_7_SRPMS
+baseurl=http://epel.blizoo.mk/epel/7/SRPMS
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_ftp_iij_ad_jp.repo b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_ftp_iij_ad_jp.repo
new file mode 100644
index 00000000..7d3318ee
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_ftp_iij_ad_jp.repo
@@ -0,0 +1,7 @@
+####
+# ftp.iij.ad.jp
+
+[Starlingx-ftp.iij.ad.jp_pub_linux_centos_7_rt_x86_64]
+name=Starlingx-ftp.iij.ad.jp_pub_linux_centos_7_rt_x86_64 - ftp.iij.ad.jp_pub_linux_centos_7_rt_x86_64
+baseurl=http://ftp.iij.ad.jp/pub/linux/centos/7/rt/x86_64
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_ftp_riken_jp.repo b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_ftp_riken_jp.repo
new file mode 100644
index 00000000..e9bb404b
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_ftp_riken_jp.repo
@@ -0,0 +1,7 @@
+#####
+# ftp.riken.jp
+
+[Starlingx-ftp.riken.jp_Linux_cern_centos_7_rt_Sources]
+name=Starlingx-ftp.riken.jp_Linux_cern_centos_7_rt_Sources - ftp.riken.jp_Linux_cern_centos_7_rt_Sources
+baseurl=http://ftp.riken.jp/Linux/cern/centos/7/rt/Sources
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_mirrors_isu_net_sa.repo b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_mirrors_isu_net_sa.repo
new file mode 100644
index 00000000..4f2ab527
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_mirrors_isu_net_sa.repo
@@ -0,0 +1,12 @@
+#####
+# mirrors.isu.net.sa
+
+[Starlingx-mirrors.isu.net.sa_pub_fedora_fedora-epel_7Server_x86_64]
+name=Starlingx-mirrors.isu.net.sa_pub_fedora_fedora-epel_7Server_x86_64 - mirrors.isu.net.sa_pub_fedora_fedora-epel_7Server_x86_64
+baseurl=http://mirrors.isu.net.sa/pub/fedora/fedora-epel/7Server/x86_64
+enabled=1
+
+[Starlingx-mirrors.isu.net.sa_pub_fedora_fedora-epel_7_SRPMS]
+name=Starlingx-mirrors.isu.net.sa_pub_fedora_fedora-epel_7_SRPMS - mirrors.isu.net.sa_pub_fedora_fedora-epel_7_SRPMS
+baseurl=http://mirrors.isu.net.sa/pub/fedora/fedora-epel/7/SRPMS
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX_3rd_www_rpmfind_net.repo b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_www_rpmfind_net.repo
new file mode 100644
index 00000000..48f8a62e
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX_3rd_www_rpmfind_net.repo
@@ -0,0 +1,7 @@
+#####
+# www.rpmfind.net
+
+[Starlingx-www.rpmfind.net_linux_epel_7_x86_64]
+name=Starlingx-www.rpmfind.net_linux_epel_7_x86_64 - www.rpmfind.net_linux_epel_7_x86_64
+baseurl=https://www.rpmfind.net/linux/epel/7/x86_64
+enabled=1