diff --git a/DependenciesReviewer.py b/DependenciesReviewer.py
index 728aaf90..04e71199 100644
--- a/DependenciesReviewer.py
+++ b/DependenciesReviewer.py
@@ -29,7 +29,7 @@ DISTRO = SELECT["centos"]
 # Global variables
 USER = getpass.getuser()
 WORK = os.path.abspath("..")
-REPOS = os.path.join(WORK, "cgcs-root/stx/")
+REPOS = os.path.join(WORK, "root/stx/")
 MTOOLS = os.path.join(WORK, "stx-tools/centos-mirror-tools")
 
 class PkgInfo:
diff --git a/Dockerfile b/Dockerfile
index 5bf76c7d..00201380 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,29 +25,44 @@ FROM centos:8.1.1911
 #    echo -e "export http_proxy=$http_proxy\nexport https_proxy=$https_proxy\n\
 #export ftp_proxy=$ftp_proxy\nexport no_proxy=$no_proxy" >> /root/.bashrc
 
-RUN echo "http_caching=packages" >> /etc/dnf/dnf.conf
-
 # username you will docker exec into the container as.
 # It should NOT be your host username so you can easily tell
 # if you are in our out of the container.
 ARG MYUNAME=builder
 ARG MYUID=1000
+# CentOS & EPEL URLs that match the base image
+# Override these with --build-arg if you have a mirror
+ARG CENTOS_8_1_URL=https://vault.centos.org/8.1.1911
+ARG EPEL_8_1_URL=https://archives.fedoraproject.org/pub/archive/epel/8.1.2020-04-22/Everything
+ARG MY_EMAIL=
 
 ENV container=docker
 
+# Lock down centos & epel repos
+RUN rm -f /etc/yum.repos.d/*
+COPY toCOPY/yum.repos.d/*.repo /etc/yum.repos.d/
+COPY centos-mirror-tools/rpm-gpg-keys/RPM-GPG-KEY-EPEL-8 /etc/pki/rpm-gpg/
+RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY* && \
+    echo "http_caching=packages" >> /etc/dnf/dnf.conf && \
+    # dnf variables must be in lower case ; \
+    echo "$CENTOS_8_1_URL" > /etc/dnf/vars/centos_8_1_url && \
+    echo "$EPEL_8_1_URL" > /etc/dnf/vars/epel_8_1_url && \
+    # disable fastestmirror plugin because we are not using mirrors ; \
+    # FIXME: use a mirrorlist URL for centos/vault/epel archives. I couldn't find one.
+    echo "fastestmirror=False" >> /etc/dnf/dnf.conf && \
+    dnf clean all && \
+    dnf makecache && \
+    dnf install -y drpm
+
+# Without this, init won't start the enabled services and exec'ing and starting
+# them reports "Failed to get D-Bus connection: Operation not permitted".
+VOLUME /run /tmp
+
 # Download required dependencies by mirror/build processes.
-# Notice there are 3 invocations to dnf package manage.
-# 1) Enable EPEL repository.
-# 2) Download required packages.
-# 3) Clean dnf cache.
 RUN groupadd -g 751 cgts && \
     echo "mock:x:751:root" >> /etc/group && \
     echo "mockbuild:x:9001:" >> /etc/group && \
-    dnf install -y epel-release && \
-    dnf install -y dnf-utils && \
-    dnf config-manager --enable PowerTools && \
     dnf install -y anaconda \
-        #anaconda-help \
         anaconda-runtime \
         autoconf-archive \
         autogen \
@@ -58,7 +73,8 @@ RUN groupadd -g 751 cgts && \
         bison \
         cpanminus \
         createrepo \
-        #deltarpm \
+        createrepo_c \
+        drpm \
         #docker-client \
         expat-devel \
         flex \
@@ -86,12 +102,13 @@ RUN groupadd -g 751 cgts && \
         #python-psutil \
         python3-psutil \
         #python36-psutil \
-        #python-sphinx \
+        python3-sphinx \
         #python-subunit \
         python3-rpm \
         #python-testrepository \
         #python-tox \
         python3-yaml \
+        python3-ruamel-yaml \
         postgresql \
         qemu-kvm \
         quilt \
@@ -101,7 +118,6 @@ RUN groupadd -g 751 cgts && \
         sudo \
         systemd \
         syslinux \
-        #syslinux-utils \
         udisks2 \
         vim-enhanced \
         wget
@@ -111,12 +127,17 @@ RUN groupadd -g 751 cgts && \
 # copied inside the image.
 COPY toCOPY/finishSetup.sh /usr/local/bin
 COPY toCOPY/populate_downloads.sh /usr/local/bin
-COPY toCOPY/generate-cgcs-tis-repo /usr/local/bin
-COPY toCOPY/generate-cgcs-centos-repo.sh /usr/local/bin
+COPY toCOPY/generate-local-repo.sh /usr/local/bin
+COPY toCOPY/generate-centos-repo.sh /usr/local/bin
 COPY toCOPY/lst_utils.sh /usr/local/bin
 COPY toCOPY/.inputrc /home/$MYUNAME/
 COPY toCOPY/builder-constraints.txt /home/$MYUNAME/
 
+# Thes are included for backward compatibility, and
+# should be removed after a reasonable time.
+COPY toCOPY/generate-cgcs-tis-repo /usr/local/bin
+COPY toCOPY/generate-cgcs-centos-repo.sh /usr/local/bin
+
 # cpan modules, installing with cpanminus to avoid stupid questions since cpan is whack
 RUN cpanm --notest Fatal && \
     cpanm --notest XML::SAX  && \
@@ -210,6 +231,20 @@ RUN echo "$MYUNAME ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers && \
     sed -i "s/dir-listing.activate/#dir-listing.activate/g" /etc/lighttpd/conf.d/dirlisting.conf && \
     echo "dir-listing.activate = \"enable\"" >> /etc/lighttpd/conf.d/dirlisting.conf
 
+# Uprev git, git-review, repo
+RUN dnf install -y dh-autoreconf curl-devel expat-devel gettext-devel  openssl-devel perl-devel zlib-devel asciidoc xmlto docbook2X && \
+    cd /tmp && \
+    wget https://github.com/git/git/archive/v2.29.2.tar.gz -O git-2.29.2.tar.gz && \
+    tar xzvf git-2.29.2.tar.gz && \
+    cd git-2.29.2 && \
+    make configure && \
+    ./configure --prefix=/usr/local && \
+    make all doc && \
+    make install install-doc && \
+    cd /tmp && \
+    rm -rf git-2.29.2.tar.gz git-2.29.2 && \
+    pip3 install git-review --upgrade
+
 # Systemd Enablement
 RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
     rm -f /lib/systemd/system/multi-user.target.wants/*;\
@@ -220,10 +255,6 @@ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == system
     rm -f /lib/systemd/system/basic.target.wants/*;\
     rm -f /lib/systemd/system/anaconda.target.wants/*
 
-# Without this, init won't start the enabled services and exec'ing and starting
-# them reports "Failed to get D-Bus connection: Operation not permitted".
-VOLUME /run /tmp
-
 RUN useradd -r -u $MYUID -g cgts -m $MYUNAME && \
     ln -s /home/$MYUNAME/.ssh /mySSH && \
     rsync -av /etc/skel/ /home/$MYUNAME/
@@ -237,13 +268,13 @@ RUN echo "bash -C /usr/local/bin/finishSetup.sh" >> /home/$MYUNAME/.bashrc && \
 # Genrate a git configuration file in order to save an extra step
 # for end users, this file is required by "repo" tool.
 RUN chown $MYUNAME /home/$MYUNAME && \
-    runuser -u $MYUNAME -- git config --global user.email $MYUNAME@starlingx.com && \
+    if [ -z $MY_EMAIL ]; then MY_EMAIL=$MYUNAME@opendev.org; fi && \
+    runuser -u $MYUNAME -- git config --global user.email $MY_EMAIL && \
     runuser -u $MYUNAME -- git config --global user.name $MYUNAME && \
     runuser -u $MYUNAME -- git config --global color.ui false
 
 # Customizations for mirror creation
-RUN rm /etc/yum.repos.d/CentOS-Sources.repo
-RUN rm /etc/yum.repos.d/epel.repo
+RUN rm /etc/yum.repos.d/*
 COPY centos-mirror-tools/yum.repos.d/* /etc/yum.repos.d/
 COPY centos-mirror-tools/rpm-gpg-keys/* /etc/pki/rpm-gpg/
 
diff --git a/README.rst b/README.rst
index f569156d..ae383fff 100644
--- a/README.rst
+++ b/README.rst
@@ -124,9 +124,9 @@ is complete, the following message appears:
     step #3: done successfully
     IMPORTANT: The following 3 files are just bootstrap versions. Based on them, the workable images
     for StarlingX could be generated by running "update-pxe-network-installer" command after "build-iso"
-        - out/stx-r1/CentOS/pike/Binary/images/install.img
-        - out/stx-r1/CentOS/pike/Binary/images/pxeboot/initrd.img
-        - out/stx-r1/CentOS/pike/Binary/images/pxeboot/vmlinuz
+        - out/stx/CentOS/Binary/images/install.img
+        - out/stx/CentOS/Binary/images/pxeboot/initrd.img
+        - out/stx/CentOS/Binary/images/pxeboot/vmlinuz
 
 Verify packages
 ~~~~~~~~~~~~~~~
@@ -153,7 +153,7 @@ After all downloads are complete, copy the downloaded files to mirror.
 
     $ find ./output -name "*.i686.rpm" | xargs rm -f
     $ chown  751:751 -R ./output
-    $ cp -rf  output/stx-r1/ <your_mirror_folder>/
+    $ cp -rf  output/stx/ <your_mirror_folder>/
 
 In this case, ``<your_mirror_folder>`` can be whatever folder you want to
 use as mirror.
@@ -164,7 +164,7 @@ Tweaks in the StarlingX build system.
 NOTE: You do not need to do the following step if you've synced the latest codebase.
 
 Go into the StarlingX build system (i.e. *another* container that hosts the
-cgcs build system) and perform the following steps:
+build system) and perform the following steps:
 
 Build packages/ISO creation
 ---------------------------
@@ -293,16 +293,16 @@ Initialize the source tree.
     repo init -u https://opendev.org/starlingx/manifest.git -m default.xml
     repo sync
 
-To generate cgcs-centos-repo
+To generate centos-repo
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The cgcs-centos-repo is a set of symbolic links to the packages in the
+The centos-repo is a set of symbolic links to the packages in the
 mirror and the mock configuration file. It is needed to create these
 links if this is the first build or the mirror has been updated.
 
 .. code-block:: bash
 
-    generate-cgcs-centos-repo.sh /import/mirrors/CentOS/pike
+    generate-centos-repo.sh /import/mirrors/CentOS
 
 Where the argument to the script is the path of the mirror.
 
@@ -314,16 +314,16 @@ To build all packages:
     $ cd $MY_REPO
     $ build-pkgs or build-pkgs --clean <pkglist>; build-pkgs <pkglist>
 
-To generate cgcs-tis-repo:
+To generate local-repo:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The cgcs-tis-repo has the dependency information that sequences the
+The local-repo has the dependency information that sequences the
 build order; To generate or update the information the following command
 needs to be executed after building modified or new packages.
 
 .. code-block:: bash
 
-    $ generate-cgcs-tis-repo
+    $ generate-local-repo.sh
 
 To make an iso:
 ~~~~~~~~~~~~~~~
diff --git a/buildrc b/buildrc
index 44edb8ce..d1704708 100644
--- a/buildrc
+++ b/buildrc
@@ -50,7 +50,7 @@ LOCALDISK=${HOST_PREFIX}/${GUEST_LOCALDISK}
 
 
 # Release Variable
-export MY_RELEASE=${MY_RELEASE:-3.0}
+export MY_RELEASE=${MY_RELEASE:-4.0}
 
 # Default branch to build
 export BRANCH=${BRANCH:-intel_r0}
diff --git a/centos-mirror-tools/config/centos/distro/rpms_3rdparties.lst b/centos-mirror-tools/config/centos/distro/rpms_3rdparties.lst
index ce4b34b7..ab2f27d5 100644
--- a/centos-mirror-tools/config/centos/distro/rpms_3rdparties.lst
+++ b/centos-mirror-tools/config/centos/distro/rpms_3rdparties.lst
@@ -21,4 +21,4 @@ python3-nose-exclude-0.5.0-7.el8.noarch.rpm#https://cbs.centos.org/kojifiles/pac
 python3-openstackdocstheme-1.29.0-6.el8.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-openstackdocstheme/1.29.0/6.el8/noarch/python3-openstackdocstheme-1.29.0-6.el8.noarch.rpm
 python3-openstacksdk-0.36.1-1.el8.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-openstacksdk/0.36.1/1.el8/noarch/python3-openstacksdk-0.36.1-1.el8.noarch.rpm
 python3-sphinxcontrib-apidoc-0.2.1-13.el8.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-sphinxcontrib-apidoc/0.2.1/13.el8/noarch/python3-sphinxcontrib-apidoc-0.2.1-13.el8.noarch.rpm
-python3-swiftclient-3.8.1-1.el8.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-swiftclient/3.8.1/1.el8/noarch/python3-swiftclient-3.8.1-1.el8.noarch.rpm
\ No newline at end of file
+python3-swiftclient-3.8.1-1.el8.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-swiftclient/3.8.1/1.el8/noarch/python3-swiftclient-3.8.1-1.el8.noarch.rpm
diff --git a/centos-mirror-tools/config/centos/distro/rpms_centos.lst b/centos-mirror-tools/config/centos/distro/rpms_centos.lst
index 02e42311..e2cae475 100644
--- a/centos-mirror-tools/config/centos/distro/rpms_centos.lst
+++ b/centos-mirror-tools/config/centos/distro/rpms_centos.lst
@@ -124,43 +124,43 @@ efivar-libs-36-1.el8.x86_64.rpm
 enchant-1.6.0-21.el8.x86_64.rpm
 enchant2-2.2.3-2.el8.x86_64.rpm
 environment-modules-4.1.4-4.el8.x86_64.rpm
-erlang-22.0.7-1.el8.x86_64.rpm
+erlang-22.2.8-1.el8.x86_64.rpm
 erlang-asn1-22.2.8-1.el8.x86_64.rpm
 erlang-common_test-22.2.8-1.el8.x86_64.rpm
 erlang-compiler-22.2.8-1.el8.x86_64.rpm
 erlang-crypto-22.2.8-1.el8.x86_64.rpm
 erlang-debugger-22.2.8-1.el8.x86_64.rpm
-erlang-dialyzer-22.0.7-1.el8.x86_64.rpm
-erlang-diameter-22.0.7-1.el8.x86_64.rpm
-erlang-edoc-22.0.7-1.el8.x86_64.rpm
+erlang-dialyzer-22.2.8-1.el8.x86_64.rpm
+erlang-diameter-22.2.8-1.el8.x86_64.rpm
+erlang-edoc-22.2.8-1.el8.x86_64.rpm
 erlang-eldap-22.2.8-1.el8.x86_64.rpm
-erlang-erl_docgen-22.0.7-1.el8.x86_64.rpm
-erlang-erl_interface-22.0.7-1.el8.x86_64.rpm
+erlang-erl_docgen-22.2.8-1.el8.x86_64.rpm
+erlang-erl_interface-22.2.8-1.el8.x86_64.rpm
 erlang-erts-22.2.8-1.el8.x86_64.rpm
 erlang-et-22.2.8-1.el8.x86_64.rpm
 erlang-eunit-22.2.8-1.el8.x86_64.rpm
-erlang-examples-22.0.7-1.el8.x86_64.rpm
-erlang-ftp-22.0.7-1.el8.x86_64.rpm
+erlang-examples-22.2.8-1.el8.x86_64.rpm
+erlang-ftp-22.2.8-1.el8.x86_64.rpm
 erlang-hipe-22.2.8-1.el8.x86_64.rpm
 erlang-inets-22.2.8-1.el8.x86_64.rpm
-erlang-jinterface-22.0.7-1.el8.x86_64.rpm
+erlang-jinterface-22.2.8-1.el8.x86_64.rpm
 erlang-kernel-22.2.8-1.el8.x86_64.rpm
-erlang-megaco-22.0.7-1.el8.x86_64.rpm
+erlang-megaco-22.2.8-1.el8.x86_64.rpm	
 erlang-mnesia-22.2.8-1.el8.x86_64.rpm
 erlang-observer-22.2.8-1.el8.x86_64.rpm
-erlang-odbc-22.0.7-1.el8.x86_64.rpm
+erlang-odbc-22.2.8-1.el8.x86_64.rpm
 erlang-os_mon-22.2.8-1.el8.x86_64.rpm
-erlang-parsetools-22.0.7-1.el8.x86_64.rpm
+erlang-parsetools-22.2.8-1.el8.x86_64.rpm
 erlang-public_key-22.2.8-1.el8.x86_64.rpm
-erlang-reltool-22.0.7-1.el8.x86_64.rpm
+erlang-reltool-22.2.8-1.el8.x86_64.rpm
 erlang-runtime_tools-22.2.8-1.el8.x86_64.rpm
 erlang-sasl-22.2.8-1.el8.x86_64.rpm
 erlang-snmp-22.2.8-1.el8.x86_64.rpm
 erlang-ssh-22.2.8-1.el8.x86_64.rpm
 erlang-ssl-22.2.8-1.el8.x86_64.rpm
 erlang-stdlib-22.2.8-1.el8.x86_64.rpm
-erlang-syntax_tools-22.0.7-1.el8.x86_64.rpm
-erlang-tftp-22.0.7-1.el8.x86_64.rpm
+erlang-syntax_tools-22.2.8-1.el8.x86_64.rpm
+erlang-tftp-22.2.8-1.el8.x86_64.rpm
 erlang-tools-22.2.8-1.el8.x86_64.rpm
 erlang-wx-22.2.8-1.el8.x86_64.rpm
 erlang-xmerl-22.2.8-1.el8.x86_64.rpm
@@ -473,7 +473,6 @@ lm_sensors-devel-3.4.0-20.20180522git70f7e08.el8.x86_64.rpm
 lm_sensors-libs-3.4.0-20.20180522git70f7e08.el8.x86_64.rpm
 lsof-4.91-2.el8.x86_64.rpm
 lua-devel-5.3.4-11.el8.x86_64.rpm
-lua-libs-5.3.4-11.el8.x86_64.rpm
 lynx-2.8.9-2.el8.x86_64.rpm
 lz4-devel-1.8.1.2-4.el8.x86_64.rpm
 lzo-devel-2.08-14.el8.x86_64.rpm
@@ -703,7 +702,6 @@ python3-paste-3.0.8-1.el8.1.noarch.rpm
 python3-paste-deploy-2.0.1-1.el8.noarch.rpm
 python3-pbr-5.1.2-3.el8.noarch.rpm
 python3-pint-0.10.1-1.el8.noarch.rpm
-python3-pip-wheel-9.0.3-15.el8.noarch.rpm
 python3-ply-3.9-7.el8.noarch.rpm
 python3-policycoreutils-2.9-3.el8_1.1.noarch.rpm
 python3-prettytable-0.7.2-14.el8.noarch.rpm
@@ -743,7 +741,6 @@ python3-selenium-3.12.0-5.el8.noarch.rpm
 python3-semantic_version-2.6.0-5.el8.noarch.rpm
 python3-setools-4.2.2-1.el8.x86_64.rpm
 python3-setuptools_scm-1.15.7-4.el8.noarch.rpm
-python3-setuptools-wheel-39.2.0-5.el8.noarch.rpm
 python3-simplegeneric-0.8.1-17.el8.noarch.rpm
 python3-simplejson-3.17.0-2.el8.x86_64.rpm
 python3-snowballstemmer-1.2.1-6.el8.noarch.rpm
@@ -864,7 +861,6 @@ source-highlight-3.1.8-16.el8.x86_64.rpm
 startup-notification-0.12-15.el8.x86_64.rpm
 subversion-1.10.2-1.module_el8.0.0+45+75bba4f4.x86_64.rpm
 subversion-libs-1.10.2-1.module_el8.0.0+45+75bba4f4.x86_64.rpm
-systemd-pam-239-18.el8_1.5.x86_64.rpm
 systemd-udev-239-18.el8_1.5.x86_64.rpm
 tbb-2018.2-9.el8.x86_64.rpm
 tcl-8.6.8-2.el8.x86_64.rpm
@@ -1087,7 +1083,6 @@ trousers-0.3.14-4.el8.x86_64.rpm
 trousers-devel-0.3.14-4.el8.x86_64.rpm
 trousers-lib-0.3.14-4.el8.x86_64.rpm
 ttmkfdir-3.0.9-54.el8.x86_64.rpm
-tzdata-2019c-1.el8.noarch.rpm
 tzdata-java-2019c-1.el8.noarch.rpm
 unbound-libs-1.7.3-8.el8.x86_64.rpm
 unixODBC-2.3.7-1.el8.x86_64.rpm
diff --git a/centos-mirror-tools/config/centos/distro/yum.repos.d/StarlingX_cengn_compiler_layer.repo b/centos-mirror-tools/config/centos/distro/yum.repos.d/StarlingX_cengn_compiler_layer.repo
index 22bd747a..4f20bbe6 100644
--- a/centos-mirror-tools/config/centos/distro/yum.repos.d/StarlingX_cengn_compiler_layer.repo
+++ b/centos-mirror-tools/config/centos/distro/yum.repos.d/StarlingX_cengn_compiler_layer.repo
@@ -3,10 +3,10 @@
 
 [Starlingx-cengn_compiler_std_layer]
 name=Starlingx-cengn_compiler_std_layer
-baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/
+baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/f/centos8/centos/compiler/latest_build/outputs/RPMS/std/
 enabled=1
 
 [Starlingx-cengn_compiler_installer_layer]
 name=Starlingx-cengn_compiler_installer_layer
-baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/installer/
+baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/f/centos8/centos/compiler/latest_build/outputs/RPMS/installer/
 enabled=1
diff --git a/centos-mirror-tools/config/centos/flock/rpms_centos.lst b/centos-mirror-tools/config/centos/flock/rpms_centos.lst
index d19ba68d..f9179032 100644
--- a/centos-mirror-tools/config/centos/flock/rpms_centos.lst
+++ b/centos-mirror-tools/config/centos/flock/rpms_centos.lst
@@ -59,11 +59,8 @@ cryptsetup-devel-2.2.0-2.el8.x86_64.rpm
 cups-libs-2.2.6-28.el8.x86_64.rpm
 cyrus-sasl-2.1.27-1.el8.x86_64.rpm
 cyrus-sasl-gssapi-2.1.27-1.el8.x86_64.rpm
-dbus-common-1.12.8-9.el8.noarch.rpm
-dbus-daemon-1.12.8-9.el8.x86_64.rpm
 dbus-devel-1.12.8-9.el8.x86_64.rpm
 dbus-glib-0.110-2.el8.x86_64.rpm
-dbus-tools-1.12.8-9.el8.x86_64.rpm
 dbxtool-8-5.el8.x86_64.rpm
 device-mapper-event-1.02.163-5.el8.0.1.x86_64.rpm
 device-mapper-event-libs-1.02.163-5.el8.0.1.x86_64.rpm
@@ -201,7 +198,6 @@ ivykis-0.42.4-2.el8.x86_64.rpm
 jansson-2.11-3.el8.x86_64.rpm
 jasper-libs-2.0.14-4.el8.x86_64.rpm
 jbigkit-libs-2.1-14.el8.x86_64.rpm
-json-c-0.13.1-0.2.el8.x86_64.rpm
 json-c-devel-0.13.1-0.2.el8.x86_64.rpm
 json-glib-1.4.4-1.el8.x86_64.rpm
 kbd-2.0.4-8.el8.x86_64.rpm
@@ -266,7 +262,6 @@ libnetfilter_queue-1.0.2-11.el8.x86_64.rpm
 libnfnetlink-1.0.1-13.el8.x86_64.rpm
 libnfsidmap-2.3.3-26.el8.x86_64.rpm
 libnftnl-1.1.1-4.el8.x86_64.rpm
-libnghttp2-1.33.0-1.el8_0.1.x86_64.rpm
 libnl3-3.4.0-5.el8.x86_64.rpm
 libnl3-cli-3.4.0-5.el8.x86_64.rpm
 libnl3-devel-3.4.0-5.el8.x86_64.rpm
@@ -288,11 +283,9 @@ librbd1-12.2.7-9.el8.x86_64.rpm
 librdmacm-22.3-1.el8.x86_64.rpm
 libref_array-0.1.5-39.el8.x86_64.rpm
 libsecret-0.18.6-1.el8.x86_64.rpm
-libselinux-2.9-2.1.el8.x86_64.rpm
 libselinux-devel-2.9-2.1.el8.x86_64.rpm
 libselinux-ruby-2.9-2.1.el8.x86_64.rpm
 libselinux-utils-2.9-2.1.el8.x86_64.rpm
-libsepol-2.9-1.el8.x86_64.rpm
 libsepol-devel-2.9-1.el8.x86_64.rpm
 libserf-1.3.9-8.module_el8.0.0+45+75bba4f4.x86_64.rpm
 libSM-1.2.3-1.el8.x86_64.rpm
@@ -393,7 +386,6 @@ numactl-libs-2.0.12-7.el8.x86_64.rpm
 openpgm-5.2.122-21.el8.x86_64.rpm
 openssl-1.1.1c-2.el8_1.1.x86_64.rpm
 openssl-devel-1.1.1c-2.el8_1.1.x86_64.rpm
-openssl-libs-1.1.1c-2.el8_1.1.x86_64.rpm
 openstack-barbican-9.0.0-1.el8.noarch.rpm
 openstack-barbican-api-9.0.0-1.el8.noarch.rpm
 openstack-barbican-common-9.0.0-1.el8.noarch.rpm
@@ -579,7 +571,6 @@ python3-pbr-5.1.2-3.el8.noarch.rpm
 python3-pecan-1.3.2-9.el8.noarch.rpm
 python3-pexpect-4.3.1-3.el8.noarch.rpm
 python3-pint-0.10.1-1.el8.noarch.rpm
-python3-pip-wheel-9.0.3-15.el8.noarch.rpm
 python3-prettytable-0.7.2-14.el8.noarch.rpm
 python3-psutil-5.6.3-5.el8.x86_64.rpm
 python3-psycopg2-2.7.5-7.el8.x86_64.rpm
@@ -625,7 +616,6 @@ python3-scss-1.3.5-9.el8.x86_64.rpm
 python3-secretstorage-3.1.1-4.el8.noarch.rpm
 python3-semantic_version-2.6.0-5.el8.noarch.rpm
 python3-setools-4.2.2-1.el8.x86_64.rpm
-python3-setuptools-wheel-39.2.0-5.el8.noarch.rpm
 python3-simplegeneric-0.8.1-17.el8.noarch.rpm
 python3-simplejson-3.17.0-2.el8.x86_64.rpm
 python3-singledispatch-3.4.0.3-18.el8.noarch.rpm
diff --git a/centos-mirror-tools/dl_lower_layer_rpms.sh b/centos-mirror-tools/dl_lower_layer_rpms.sh
index 3e530ebd..71a92b68 100755
--- a/centos-mirror-tools/dl_lower_layer_rpms.sh
+++ b/centos-mirror-tools/dl_lower_layer_rpms.sh
@@ -178,7 +178,7 @@ timestamp=$(date +%F_%H%M)
 echo $timestamp
 
 export DL_MIRROR_LOG_DIR="${DL_MIRROR_LOG_DIR:-./logs}"
-export DL_MIRROR_OUTPUT_DIR="${DL_MIRROR_OUTPUT_DIR:-./output/stx-r1/CentOS/pike}"
+export DL_MIRROR_OUTPUT_DIR="${DL_MIRROR_OUTPUT_DIR:-./output/stx/CentOS}"
 
 dl_dir="$(readlink -f ${DL_MIRROR_OUTPUT_DIR})/layer_repos/${lower_layer}/${build_type}"
 
diff --git a/centos-mirror-tools/dl_rpms.sh b/centos-mirror-tools/dl_rpms.sh
index 6c3b9ec4..b79bb03f 100755
--- a/centos-mirror-tools/dl_rpms.sh
+++ b/centos-mirror-tools/dl_rpms.sh
@@ -160,7 +160,7 @@ timestamp=$(date +%F_%H%M)
 echo $timestamp
 
 export DL_MIRROR_LOG_DIR="${DL_MIRROR_LOG_DIR:-./logs}"
-export DL_MIRROR_OUTPUT_DIR="${DL_MIRROR_OUTPUT_DIR:-./output/stx-r1/CentOS/pike}"
+export DL_MIRROR_OUTPUT_DIR="${DL_MIRROR_OUTPUT_DIR:-./output/stx/CentOS/}"
 
 MDIR_SRC="${DL_MIRROR_OUTPUT_DIR}/Source"
 mkdir -p "$MDIR_SRC"
diff --git a/centos-mirror-tools/dl_rpms_from_url.sh b/centos-mirror-tools/dl_rpms_from_url.sh
index 843de4be..9f5978da 100755
--- a/centos-mirror-tools/dl_rpms_from_url.sh
+++ b/centos-mirror-tools/dl_rpms_from_url.sh
@@ -79,7 +79,7 @@ timestamp=$(date +%F_%H%M)
 echo $timestamp
 
 export DL_MIRROR_LOG_DIR="${DL_MIRROR_LOG_DIR:-./logs}"
-export DL_MIRROR_OUTPUT_DIR="${DL_MIRROR_OUTPUT_DIR:-./output/stx-r1/CentOS/pike}"
+export DL_MIRROR_OUTPUT_DIR="${DL_MIRROR_OUTPUT_DIR:-./output/stx/CentOS}"
 
 MDIR_SRC="${DL_MIRROR_OUTPUT_DIR}/Source"
 mkdir -p "$MDIR_SRC"
diff --git a/centos-mirror-tools/dl_tarball.sh b/centos-mirror-tools/dl_tarball.sh
index c26e4092..deb8e03c 100755
--- a/centos-mirror-tools/dl_tarball.sh
+++ b/centos-mirror-tools/dl_tarball.sh
@@ -109,10 +109,10 @@ fi
 # The 2 categories we can divide the list of packages in the output directory:
 # - General hosted under "downloads" output directory.
 # - Puppet hosted under "downloads/puppet" output directory.
-# to be populated under $MY_REPO/addons/wr-cgcs/layers/cgcs/downloads/puppet
+# to be populated under $MY_REPO/downloads/puppet
 
 export DL_MIRROR_LOG_DIR="${DL_MIRROR_LOG_DIR:-./logs}"
-export DL_MIRROR_OUTPUT_DIR="${DL_MIRROR_OUTPUT_DIR:-./output/stx-r1/CentOS/pike}"
+export DL_MIRROR_OUTPUT_DIR="${DL_MIRROR_OUTPUT_DIR:-./output/stx/CentOS}"
 
 logs_dir="${DL_MIRROR_LOG_DIR}"
 output_log="$logs_dir/log_download_tarball_missing.txt"
@@ -291,7 +291,14 @@ for line in $(cat $tarball_file); do
             tar czvf $tarball_name $directory_name
             rm -rf $directory_name
             popd > /dev/null   # pushd $directory_name
-        elif [[ "$tarball_name" = 'MLNX_OFED_SRC-4.7-3.2.9.0.tgz' ]]; then
+        elif [[ "$tarball_name" = 'chartmuseum-v0.12.0-amd64' ]]; then
+            wget -q -t 5 --wait=15 -O "$tarball_name" "$tarball_url"
+            if [ $? -ne 0 ]; then
+                error_count=$((error_count + 1))
+                popd > /dev/null   # pushd $output_tarball
+                continue
+            fi
+        elif [[ "$tarball_name" = 'MLNX_OFED_SRC-5.0-2.1.8.0.tgz' ]]; then
             srpm_path="${directory_name}/SRPMS/"
             download_package "$tarball_name" "$tarball_url"
             if [ $? -ne 0 ]; then
@@ -301,9 +308,9 @@ for line in $(cat $tarball_file); do
             fi
 
             tar -xf "$tarball_name"
-            cp "${srpm_path}/mlnx-ofa_kernel-4.7-OFED.4.7.3.2.9.1.g457f064.src.rpm" .
-            cp "${srpm_path}/rdma-core-47mlnx1-1.47329.src.rpm" .
-            cp "${srpm_path}/libibverbs-41mlnx1-OFED.4.7.0.0.2.47329.src.rpm" .
+            cp "${srpm_path}/mlnx-ofa_kernel-5.0-OFED.5.0.2.1.8.1.g5f67178.src.rpm" .
+            cp "${srpm_path}/rdma-core-50mlnx1-1.50218.src.rpm" .
+            cp "${srpm_path}/libibverbs-41mlnx1-OFED.5.0.0.0.9.50218.src.rpm" .
             # Don't delete the original MLNX_OFED_LINUX tarball.
             # We don't use it, but it will prevent re-downloading this file.
             #   rm -f "$tarball_name"
diff --git a/centos-mirror-tools/download_mirror.sh b/centos-mirror-tools/download_mirror.sh
index 67d4fc3c..a536fa04 100755
--- a/centos-mirror-tools/download_mirror.sh
+++ b/centos-mirror-tools/download_mirror.sh
@@ -8,7 +8,18 @@ DOWNLOAD_MIRROR_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 source $DOWNLOAD_MIRROR_DIR/../toCOPY/lst_utils.sh
 
 export DL_MIRROR_LOG_DIR="${DL_MIRROR_LOG_DIR:-./logs}"
-export DL_MIRROR_OUTPUT_DIR="${DL_MIRROR_OUTPUT_DIR:-./output/stx-r1/CentOS/pike}"
+export DL_MIRROR_OUTPUT_DIR="${DL_MIRROR_OUTPUT_DIR:-./output/stx/CentOS}"
+
+# A temporary compatability step to save download time
+# during the shift to the new DL_MIRROR_OUTPUT_DIR location.
+#
+# Relocate downloaded rpms from the old location to the new.
+pike_dir="./output/stx-r1/CentOS/pike"
+if [ -d $pike_dir ] && [ ! -d $DL_MIRROR_OUTPUT_DIR ]; then
+    mkdir -p $(dirname $DL_MIRROR_OUTPUT_DIR)
+    mv $pike_dir $DL_MIRROR_OUTPUT_DIR
+    \rm -rf ./output/stx-r1
+fi
 
 usage() {
     echo "$0 [options]"
diff --git a/centos-mirror-tools/rpm-gpg-keys/RPM-GPG-KEY-CentOS-7 b/centos-mirror-tools/rpm-gpg-keys/RPM-GPG-KEY-CentOS-7
new file mode 100644
index 00000000..47f6d4d6
--- /dev/null
+++ b/centos-mirror-tools/rpm-gpg-keys/RPM-GPG-KEY-CentOS-7
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBFOn/0sBEADLDyZ+DQHkcTHDQSE0a0B2iYAEXwpPvs67cJ4tmhe/iMOyVMh9
+Yw/vBIF8scm6T/vPN5fopsKiW9UsAhGKg0epC6y5ed+NAUHTEa6pSOdo7CyFDwtn
+4HF61Esyb4gzPT6QiSr0zvdTtgYBRZjAEPFVu3Dio0oZ5UQZ7fzdZfeixMQ8VMTQ
+4y4x5vik9B+cqmGiq9AW71ixlDYVWasgR093fXiD9NLT4DTtK+KLGYNjJ8eMRqfZ
+Ws7g7C+9aEGHfsGZ/SxLOumx/GfiTloal0dnq8TC7XQ/JuNdB9qjoXzRF+faDUsj
+WuvNSQEqUXW1dzJjBvroEvgTdfCJfRpIgOrc256qvDMp1SxchMFltPlo5mbSMKu1
+x1p4UkAzx543meMlRXOgx2/hnBm6H6L0FsSyDS6P224yF+30eeODD4Ju4BCyQ0jO
+IpUxmUnApo/m0eRelI6TRl7jK6aGqSYUNhFBuFxSPKgKYBpFhVzRM63Jsvib82rY
+438q3sIOUdxZY6pvMOWRkdUVoz7WBExTdx5NtGX4kdW5QtcQHM+2kht6sBnJsvcB
+JYcYIwAUeA5vdRfwLKuZn6SgAUKdgeOtuf+cPR3/E68LZr784SlokiHLtQkfk98j
+NXm6fJjXwJvwiM2IiFyg8aUwEEDX5U+QOCA0wYrgUQ/h8iathvBJKSc9jQARAQAB
+tEJDZW50T1MtNyBLZXkgKENlbnRPUyA3IE9mZmljaWFsIFNpZ25pbmcgS2V5KSA8
+c2VjdXJpdHlAY2VudG9zLm9yZz6JAjUEEwECAB8FAlOn/0sCGwMGCwkIBwMCBBUC
+CAMDFgIBAh4BAheAAAoJECTGqKf0qA61TN0P/2730Th8cM+d1pEON7n0F1YiyxqG
+QzwpC2Fhr2UIsXpi/lWTXIG6AlRvrajjFhw9HktYjlF4oMG032SnI0XPdmrN29lL
+F+ee1ANdyvtkw4mMu2yQweVxU7Ku4oATPBvWRv+6pCQPTOMe5xPG0ZPjPGNiJ0xw
+4Ns+f5Q6Gqm927oHXpylUQEmuHKsCp3dK/kZaxJOXsmq6syY1gbrLj2Anq0iWWP4
+Tq8WMktUrTcc+zQ2pFR7ovEihK0Rvhmk6/N4+4JwAGijfhejxwNX8T6PCuYs5Jiv
+hQvsI9FdIIlTP4XhFZ4N9ndnEwA4AH7tNBsmB3HEbLqUSmu2Rr8hGiT2Plc4Y9AO
+aliW1kOMsZFYrX39krfRk2n2NXvieQJ/lw318gSGR67uckkz2ZekbCEpj/0mnHWD
+3R6V7m95R6UYqjcw++Q5CtZ2tzmxomZTf42IGIKBbSVmIS75WY+cBULUx3PcZYHD
+ZqAbB0Dl4MbdEH61kOI8EbN/TLl1i077r+9LXR1mOnlC3GLD03+XfY8eEBQf7137
+YSMiW5r/5xwQk7xEcKlbZdmUJp3ZDTQBXT06vavvp3jlkqqH9QOE8ViZZ6aKQLqv
+pL+4bs52jzuGwTMT7gOR5MzD+vT0fVS7Xm8MjOxvZgbHsAgzyFGlI1ggUQmU7lu3
+uPNL0eRx4S1G4Jn5
+=OGYX
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/centos-mirror-tools/rpm-gpg-keys/RPM-GPG-KEY-CentOS-8 b/centos-mirror-tools/rpm-gpg-keys/RPM-GPG-KEY-CentOS-8
new file mode 100644
index 00000000..30235a86
--- /dev/null
+++ b/centos-mirror-tools/rpm-gpg-keys/RPM-GPG-KEY-CentOS-8
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+mQINBFzMWxkBEADHrskpBgN9OphmhRkc7P/YrsAGSvvl7kfu+e9KAaU6f5MeAVyn
+rIoM43syyGkgFyWgjZM8/rur7EMPY2yt+2q/1ZfLVCRn9856JqTIq0XRpDUe4nKQ
+8BlA7wDVZoSDxUZkSuTIyExbDf0cpw89Tcf62Mxmi8jh74vRlPy1PgjWL5494b3X
+5fxDidH4bqPZyxTBqPrUFuo+EfUVEqiGF94Ppq6ZUvrBGOVo1V1+Ifm9CGEK597c
+aevcGc1RFlgxIgN84UpuDjPR9/zSndwJ7XsXYvZ6HXcKGagRKsfYDWGPkA5cOL/e
+f+yObOnC43yPUvpggQ4KaNJ6+SMTZOKikM8yciyBwLqwrjo8FlJgkv8Vfag/2UR7
+JINbyqHHoLUhQ2m6HXSwK4YjtwidF9EUkaBZWrrskYR3IRZLXlWqeOi/+ezYOW0m
+vufrkcvsh+TKlVVnuwmEPjJ8mwUSpsLdfPJo1DHsd8FS03SCKPaXFdD7ePfEjiYk
+nHpQaKE01aWVSLUiygn7F7rYemGqV9Vt7tBw5pz0vqSC72a5E3zFzIIuHx6aANry
+Gat3aqU3qtBXOrA/dPkX9cWE+UR5wo/A2UdKJZLlGhM2WRJ3ltmGT48V9CeS6N9Y
+m4CKdzvg7EWjlTlFrd/8WJ2KoqOE9leDPeXRPncubJfJ6LLIHyG09h9kKQARAQAB
+tDpDZW50T1MgKENlbnRPUyBPZmZpY2lhbCBTaWduaW5nIEtleSkgPHNlY3VyaXR5
+QGNlbnRvcy5vcmc+iQI3BBMBAgAhBQJczFsZAhsDBgsJCAcDAgYVCAIJCgsDFgIB
+Ah4BAheAAAoJEAW1VbOEg8ZdjOsP/2ygSxH9jqffOU9SKyJDlraL2gIutqZ3B8pl
+Gy/Qnb9QD1EJVb4ZxOEhcY2W9VJfIpnf3yBuAto7zvKe/G1nxH4Bt6WTJQCkUjcs
+N3qPWsx1VslsAEz7bXGiHym6Ay4xF28bQ9XYIokIQXd0T2rD3/lNGxNtORZ2bKjD
+vOzYzvh2idUIY1DgGWJ11gtHFIA9CvHcW+SMPEhkcKZJAO51ayFBqTSSpiorVwTq
+a0cB+cgmCQOI4/MY+kIvzoexfG7xhkUqe0wxmph9RQQxlTbNQDCdaxSgwbF2T+gw
+byaDvkS4xtR6Soj7BKjKAmcnf5fn4C5Or0KLUqMzBtDMbfQQihn62iZJN6ZZ/4dg
+q4HTqyVpyuzMXsFpJ9L/FqH2DJ4exGGpBv00ba/Zauy7GsqOc5PnNBsYaHCply0X
+407DRx51t9YwYI/ttValuehq9+gRJpOTTKp6AjZn/a5Yt3h6jDgpNfM/EyLFIY9z
+V6CXqQQ/8JRvaik/JsGCf+eeLZOw4koIjZGEAg04iuyNTjhx0e/QHEVcYAqNLhXG
+rCTTbCn3NSUO9qxEXC+K/1m1kaXoCGA0UWlVGZ1JSifbbMx0yxq/brpEZPUYm+32
+o8XfbocBWljFUJ+6aljTvZ3LQLKTSPW7TFO+GXycAOmCGhlXh2tlc6iTc41PACqy
+yy+mHmSv
+=kkH7
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/centos-mirror-tools/starlingx_add_pkgs.sh b/centos-mirror-tools/starlingx_add_pkgs.sh
index 4245e3ee..fb792316 100755
--- a/centos-mirror-tools/starlingx_add_pkgs.sh
+++ b/centos-mirror-tools/starlingx_add_pkgs.sh
@@ -90,11 +90,11 @@ source $STARLINGX_ADD_PKGS_DIR/../toCOPY/lst_utils.sh
 
 STXTOOLS=${MY_REPO_ROOT_DIR}/stx-tools
 
-CGCSREPO_PATH=$MY_REPO/cgcs-centos-repo/Binary
-TISREPO_PATH=$MY_WORKSPACE/std/rpmbuild/RPMS
-TISREPO_PATH_ARGS=
-if [ -e $TISREPO_PATH/repodata/repomd.xml ]; then
-    TISREPO_PATH_ARGS="--repofrompath tis,$TISREPO_PATH"
+LOCALREPO_PATH=$MY_REPO/centos-repo/Binary
+STDREPO_PATH=$MY_WORKSPACE/std/rpmbuild/RPMS
+STDREPO_PATH_ARGS=
+if [ -e $STDREPO_PATH/repodata/repomd.xml ]; then
+    STDREPO_PATH_ARGS="--repofrompath tis,$STDREPO_PATH"
 fi
 
 RESULTS_LOG=downloaded.log
@@ -117,14 +117,14 @@ function show_usage {
 Usage:
     $(basename $0) [ -C <config_dir> ] [ -l <layer> ] [ -d <pkgname> ] ... [ <rpmfile> ] ...
 
-This utility uses the cgcs-centos-repo repo, and optionally the rpmbuild/RPMS
+This utility uses the centos-repo repo, and optionally the rpmbuild/RPMS
 repo from \$MY_WORKSPACE/std, as a baseline, downloading packages required
 to support the list provided at command-line. The -d option allows the user to
 specify a package to download, or the user can specify a downloaded RPM file
 that has dependencies that must be downloaded.
 
 The downloaded RPMs will be written to the appropriate location under the
-\$MY_REPO/cgcs-centos-repo directory. The user should be able to differentiate
+\$MY_REPO/centos-repo directory. The user should be able to differentiate
 the downloaded files versus symlinks pointing to a downloaded or shared mirror.
 
 In addition, this utility will record a list of downloaded RPMs in the $RESULTS_LOG
@@ -200,7 +200,7 @@ REPOQUERY_STD_CMD="$REPOQUERY_CMD --quiet -c $REPOCFG_STD_MERGED"
 REPOQUERY_3RD_CMD="$REPOQUERY_CMD --quiet -c $REPOCFG_3RD_MERGED"
 REPOQUERY_LOWER_LAYER_CMD="$REPOQUERY_CMD --quiet -c $REPOCFG_LOWER_LAYER_MERGED"
 REPOQUERY_ALL_CMD="$REPOQUERY_CMD --quiet -c $REPOCFG_ALL_MERGED"
-REPOQUERY_LOCAL_CMD="$REPOQUERY_CMD --quiet --repofrompath cgcs,$CGCSREPO_PATH $TISREPO_PATH_ARGS"
+REPOQUERY_LOCAL_CMD="$REPOQUERY_CMD --quiet --repofrompath local,$LOCALREPO_PATH $STDREPO_PATH_ARGS"
 
 
 function rpmfile_requires {
@@ -268,7 +268,7 @@ function simplified_pkg {
     echo $pkg | sed 's/-[0-9]*:/-/'
 }
 
-function pkg_in_cgcsrepo {
+function pkg_in_localrepo {
     #
     # Check whether the specified package is already in the downloaded (or built) repo
     #
@@ -331,7 +331,7 @@ function download_pkg {
     fi
 
     echo "Downloading $url"
-    rpm_path=$CGCSREPO_PATH/$arch/$(basename $relativepath)
+    rpm_path=$LOCALREPO_PATH/$arch/$(basename $relativepath)
     wget -q -O $rpm_path $url
 
     if [ $? -ne 0 ]; then
@@ -341,7 +341,7 @@ function download_pkg {
     fi
 
     # Update repo
-    pushd $CGCSREPO_PATH >/dev/null
+    pushd $LOCALREPO_PATH >/dev/null
     createrepo -q -g comps.xml .
     if [ $? -ne 0 ]; then
         echo "createrepo failed... Aborting" >&2
@@ -369,7 +369,7 @@ function download_rpm_dependencies {
             continue
         fi
 
-        pkg_in_cgcsrepo $pkg && continue
+        pkg_in_localrepo $pkg && continue
         download_pkg $pkg
     done || exit $?
 }
@@ -383,7 +383,7 @@ if [ -n "$RPMLIST" ]; then
                 continue
             fi
 
-            pkg_in_cgcsrepo $pkg && continue
+            pkg_in_localrepo $pkg && continue
             download_pkg $pkg
 
         done || exit $?
@@ -392,7 +392,7 @@ fi
 
 if [ -n "$DOWNLOAD_LIST" ]; then
     for df in $DOWNLOAD_LIST; do
-        pkg_in_cgcsrepo $df && continue
+        pkg_in_localrepo $df && continue
         download_pkg $df
     done
 fi
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
index 9b8fe04b..0c0dcc13 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.2.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.2.repo
@@ -3,84 +3,84 @@
 # 
 [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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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
+baseurl=https://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
+baseurl=https://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
+baseurl=https://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
 
 [Starlingx-C7.2.1511-cr-source]
 name=Starlingx-CentOS-7.2.1511 - cr-source
-baseurl=http://vault.centos.org/centos/7.2.1511/cr/Source
+baseurl=https://vault.centos.org/centos/7.2.1511/cr/Source
 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
index 9bd18865..2691e67a 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.3.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.3.repo
@@ -3,70 +3,70 @@
 # 
 [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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://vault.centos.org/7.3.1611/rt/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
@@ -75,42 +75,42 @@ 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/
+baseurl=https://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/
+baseurl=https://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
+baseurl=https://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
+baseurl=https://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
+baseurl=https://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
+baseurl=https://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
@@ -118,14 +118,14 @@ 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
+baseurl=https://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-cr-source]
 name=Starlingx-CentOS-7.3.1611 - cr-source
-baseurl=http://vault.centos.org/centos/7.3.1611/cr/Source
+baseurl=https://vault.centos.org/centos/7.3.1611/cr/Source
 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
index f123c7a0..dbae99e4 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.4.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.4.repo
@@ -3,77 +3,77 @@
 # 
 [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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://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/
+baseurl=https://vault.centos.org/7.4.1708/rt/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
@@ -82,56 +82,56 @@ 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/
+baseurl=https://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/
+baseurl=https://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
+baseurl=https://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
+baseurl=https://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
+baseurl=https://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
+baseurl=https://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
+baseurl=https://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
 
 [Starlingx-C7.4.1708-cr-source]
 name=Starlingx-CentOS-7.4.1708 - cr-source
-baseurl=http://vault.centos.org/centos/7.4.1708/cr/Source
+baseurl=https://vault.centos.org/centos/7.4.1708/cr/Source
 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
index 47d0b35a..430a031c 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.5.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.5.repo
@@ -3,56 +3,56 @@
 #
 [Starlingx-C7.5.1804-cloud-pike]
 name=Starlingx-CentOS-7.5.1804 - Cloud-pike
-baseurl=http://vault.centos.org/7.5.1804/cloud/x86_64/openstack-pike/
+baseurl=https://vault.centos.org/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/
+baseurl=https://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://vault.centos.org/7.5.1804/extras/x86_64/
+baseurl=https://vault.centos.org/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/
+baseurl=https://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://vault.centos.org/7.5.1804/os/x86_64/
+baseurl=https://vault.centos.org/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/
+baseurl=https://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-paas-openshift]
 name=Starlingx-CentOS-7.5.1804 - pass-openshift
-baseurl=http://vault.centos.org/7.5.1804/paas/x86_64/openshift-origin311/
+baseurl=https://vault.centos.org/7.5.1804/paas/x86_64/openshift-origin311/
 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://vault.centos.org/7.5.1804/rt/x86_64/
+baseurl=https://vault.centos.org/7.5.1804/rt/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
@@ -60,56 +60,56 @@ 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/
+# baseurl=https://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://vault.centos.org/7.5.1804/updates/x86_64/
+baseurl=https://vault.centos.org/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/
+baseurl=https://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://vault.centos.org/7.5.1804/virt/x86_64/kvm-common
+baseurl=https://vault.centos.org/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
+baseurl=https://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://vault.centos.org/7.5.1804/virt/x86_64/libvirt-latest
+baseurl=https://vault.centos.org/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
+baseurl=https://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
 
 [Starlingx-C7.5.1804-virt-kubernetes-source]
 name=Starlingx-CentOS-7.5.1804 - virt-kubernetes-source
-baseurl=http://vault.centos.org/7.5.1804/virt/Source/kubernetes110
+baseurl=https://vault.centos.org/7.5.1804/virt/Source/kubernetes110
 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.6.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.6.repo
index 69a5d3d5..d9c32301 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.6.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.6.repo
@@ -4,175 +4,175 @@
 
 [StarlingX-C7.6.1810-atomic]
 name=StarlingX-CentOS-7.6.1810 - atomic
-baseurl=http://vault.centos.org/centos/7.6.1810/atomic/x86_64/
+baseurl=https://vault.centos.org/centos/7.6.1810/atomic/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-centosplus]
 name=StarlingX-CentOS-7.6.1810 - centosplus
-baseurl=http://vault.centos.org/centos/7.6.1810/centosplus/x86_64/
+baseurl=https://vault.centos.org/centos/7.6.1810/centosplus/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-centosplus-source]
 name=StarlingX-CentOS-7.6.1810 - centosplus-source
-baseurl=http://vault.centos.org/7.6.1810/centosplus/Source/
+baseurl=https://vault.centos.org/7.6.1810/centosplus/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-cloud-pike]
 name=StarlingX-CentOS-7.6.1810 - Cloud-pike
-baseurl=http://vault.centos.org/centos/7.6.1810/cloud/x86_64/openstack-pike/
+baseurl=https://vault.centos.org/centos/7.6.1810/cloud/x86_64/openstack-pike/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-cloud-pike-source]
 name=StarlingX-CentOS-7.6.1810 - cloud-pike-source
-baseurl=http://vault.centos.org/7.6.1810/cloud/Source/openstack-pike/
+baseurl=https://vault.centos.org/7.6.1810/cloud/Source/openstack-pike/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-extras]
 name=StarlingX-CentOS-7.6.1810 - extras
-baseurl=http://vault.centos.org/centos/7.6.1810/extras/x86_64/
+baseurl=https://vault.centos.org/centos/7.6.1810/extras/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-extras-source]
 name=StarlingX-CentOS-7.6.1810 - extras-source
-baseurl=http://vault.centos.org/7.6.1810/extras/Source/
+baseurl=https://vault.centos.org/7.6.1810/extras/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-nfv-fdio]
 name=StarlingX-CentOS-7.6.1810 - nfv
-baseurl=http://vault.centos.org/centos/7.6.1810/nfv/x86_64/fdio/
+baseurl=https://vault.centos.org/centos/7.6.1810/nfv/x86_64/fdio/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-opstools]
 name=StarlingX-CentOS-7.6.1810 - opstools
-baseurl=http://vault.centos.org/centos/7.6.1810/opstools/x86_64/
+baseurl=https://vault.centos.org/centos/7.6.1810/opstools/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-opstools-source]
 name=StarlingX-CentOS-7.6.1810 - opstools-source
-baseurl=http://vault.centos.org/7.6.1810/opstools/Source/
+baseurl=https://vault.centos.org/7.6.1810/opstools/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-os]
 name=StarlingX-CentOS-7.6.1810 - os
-baseurl=http://vault.centos.org/centos/7.6.1810/os/x86_64/
+baseurl=https://vault.centos.org/centos/7.6.1810/os/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-os-source]
 name=StarlingX-CentOS-7.6.1810 - os-source
-baseurl=http://vault.centos.org/7.6.1810/os/Source/
+baseurl=https://vault.centos.org/7.6.1810/os/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-paas-openshift-origin]
 name=StarlingX-CentOS-7.6.1810 - paas-openshift-origin
-baseurl=http://vault.centos.org/centos/7.6.1810/paas/x86_64/openshift-origin/
+baseurl=https://vault.centos.org/centos/7.6.1810/paas/x86_64/openshift-origin/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-paas-openshift-origin311]
 name=StarlingX-CentOS-7.6.1810 - paas-openshift-origin311
-baseurl=http://vault.centos.org/centos/7.6.1810/paas/x86_64/openshift-origin311/
+baseurl=https://vault.centos.org/centos/7.6.1810/paas/x86_64/openshift-origin311/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-rt]
 name=StarlingX-CentOS-7.6.1810 - rt
-baseurl=http://vault.centos.org/centos/7.6.1810/rt/x86_64/
+baseurl=https://vault.centos.org/centos/7.6.1810/rt/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-sclo-sclo]
 name=StarlingX-CentOS-7.6.1810 - sclo-sclo
-baseurl=http://vault.centos.org/centos/7.6.1810/sclo/x86_64/sclo/
+baseurl=https://vault.centos.org/centos/7.6.1810/sclo/x86_64/sclo/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-storage-ceph-jewel]
 name=StarlingX-CentOS-7.6.1810 - storage-ceph-jewel
-baseurl=http://vault.centos.org/centos/7.6.1810/storage/x86_64/ceph-jewel/
+baseurl=https://vault.centos.org/centos/7.6.1810/storage/x86_64/ceph-jewel/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-storage-ceph-luminous]
 name=StarlingX-CentOS-7.6.1810 - storage-ceph-luminous
-baseurl=http://vault.centos.org/centos/7.6.1810/storage/x86_64/ceph-luminous/
+baseurl=https://vault.centos.org/centos/7.6.1810/storage/x86_64/ceph-luminous/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-storage-ceph-nautilus]
 name=StarlingX-CentOS-7.6.1810 - storage-ceph-nautilus
-baseurl=http://vault.centos.org/centos/7.6.1810/storage/x86_64/ceph-nautilus/
+baseurl=https://vault.centos.org/centos/7.6.1810/storage/x86_64/ceph-nautilus/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-storage-gluster-5]
 name=StarlingX-CentOS-7.6.1810 - storage-gluster-5
-baseurl=http://vault.centos.org/centos/7.6.1810/storage/x86_64/gluster-5/
+baseurl=https://vault.centos.org/centos/7.6.1810/storage/x86_64/gluster-5/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-updates]
 name=StarlingX-CentOS-7.6.1810 - updates
-baseurl=http://vault.centos.org/centos/7.6.1810/updates/x86_64/
+baseurl=https://vault.centos.org/centos/7.6.1810/updates/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-updates-source]
 name=StarlingX-CentOS-7.6.1810 - updates-source
-baseurl=http://vault.centos.org/7.6.1810/updates/Source/
+baseurl=https://vault.centos.org/7.6.1810/updates/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-virt-kvm]
 name=StarlingX-CentOS-7.6.1810 - virt-kvm
-baseurl=http://vault.centos.org/centos/7.6.1810/virt/x86_64/kvm-common/
+baseurl=https://vault.centos.org/centos/7.6.1810/virt/x86_64/kvm-common/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.6.1810-virt-libvirt]
 name=StarlingX-CentOS-7.6.1810 - virt-libvirt
-baseurl=http://vault.centos.org/centos/7.6.1810/virt/x86_64/libvirt-latest/
+baseurl=https://vault.centos.org/centos/7.6.1810/virt/x86_64/libvirt-latest/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=0
 
 [StarlingX-C7.6.1810-sclo-rh]
 name=StarlingX-CentOS-7.6.1810 - sclo-rh
-baseurl=http://vault.centos.org/centos/7.6.1810/sclo/x86_64/rh/
+baseurl=https://vault.centos.org/centos/7.6.1810/sclo/x86_64/rh/
 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.7.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.7.repo
index de192db5..fe99259a 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.7.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.7.repo
@@ -4,161 +4,161 @@
 
 [StarlingX-C7.7.1908-atomic]
 name=StarlingX-CentOS-7.7.1908 - atomic
-baseurl=http://vault.centos.org/7.7.1908/atomic/x86_64/
+baseurl=https://vault.centos.org/7.7.1908/atomic/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-centosplus]
 name=StarlingX-CentOS-7.7.1908 - centosplus
-baseurl=http://vault.centos.org/7.7.1908/centosplus/x86_64/
+baseurl=https://vault.centos.org/7.7.1908/centosplus/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-centosplus-source]
 name=StarlingX-CentOS-7.7.1908 - centosplus-source
-baseurl=http://vault.centos.org/7.7.1908/centosplus/Source/
+baseurl=https://vault.centos.org/7.7.1908/centosplus/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-extras]
 name=StarlingX-CentOS-7.7.1908 - extras
-baseurl=http://vault.centos.org/7.7.1908/extras/x86_64/
+baseurl=https://vault.centos.org/7.7.1908/extras/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-extras-source]
 name=StarlingX-CentOS-7.7.1908 - extras-source
-baseurl=http://vault.centos.org/7.7.1908/extras/Source/
+baseurl=https://vault.centos.org/7.7.1908/extras/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-nfv-fdio]
 name=StarlingX-CentOS-7.7.1908 - nfv
-baseurl=http://vault.centos.org/7.7.1908/nfv/x86_64/fdio/
+baseurl=https://vault.centos.org/7.7.1908/nfv/x86_64/fdio/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-opstools]
 name=StarlingX-CentOS-7.7.1908 - opstools
-baseurl=http://vault.centos.org/7.7.1908/opstools/x86_64/
+baseurl=https://vault.centos.org/7.7.1908/opstools/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 # [StarlingX-C7.7.1908-opstools-source]
 # name=StarlingX-CentOS-7.7.1908 - opstools-source
-# baseurl=http://vault.centos.org/7.7.1908/opstools/Source/
+# baseurl=https://vault.centos.org/7.7.1908/opstools/Source/
 # gpgcheck=1
 # gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 # enabled=1
 
 [StarlingX-C7.7.1908-os]
 name=StarlingX-CentOS-7.7.1908 - os
-baseurl=http://vault.centos.org/7.7.1908/os/x86_64/
+baseurl=https://vault.centos.org/7.7.1908/os/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-os-source]
 name=StarlingX-CentOS-7.7.1908 - os-source
-baseurl=http://vault.centos.org/7.7.1908/os/Source/
+baseurl=https://vault.centos.org/7.7.1908/os/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-paas-openshift-origin]
 name=StarlingX-CentOS-7.7.1908 - paas-openshift-origin
-baseurl=http://vault.centos.org/7.7.1908/paas/x86_64/openshift-origin/
+baseurl=https://vault.centos.org/7.7.1908/paas/x86_64/openshift-origin/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-paas-openshift-origin311]
 name=StarlingX-CentOS-7.7.1908 - paas-openshift-origin311
-baseurl=http://vault.centos.org/7.7.1908/paas/x86_64/openshift-origin311/
+baseurl=https://vault.centos.org/7.7.1908/paas/x86_64/openshift-origin311/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-rt]
 name=StarlingX-CentOS-7.7.1908 - rt
-baseurl=http://vault.centos.org/7.7.1908/rt/x86_64/
+baseurl=https://vault.centos.org/7.7.1908/rt/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-sclo-sclo]
 name=StarlingX-CentOS-7.7.1908 - sclo-sclo
-baseurl=http://vault.centos.org/7.7.1908/sclo/x86_64/sclo/
+baseurl=https://vault.centos.org/7.7.1908/sclo/x86_64/sclo/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-storage-ceph-jewel]
 name=StarlingX-CentOS-7.7.1908 - storage-ceph-jewel
-baseurl=http://vault.centos.org/7.7.1908/storage/x86_64/ceph-jewel/
+baseurl=https://vault.centos.org/7.7.1908/storage/x86_64/ceph-jewel/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-storage-ceph-luminous]
 name=StarlingX-CentOS-7.7.1908 - storage-ceph-luminous
-baseurl=http://vault.centos.org/7.7.1908/storage/x86_64/ceph-luminous/
+baseurl=https://vault.centos.org/7.7.1908/storage/x86_64/ceph-luminous/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-storage-ceph-nautilus]
 name=StarlingX-CentOS-7.7.1908 - storage-ceph-nautilus
-baseurl=http://vault.centos.org/7.7.1908/storage/x86_64/ceph-nautilus/
+baseurl=https://vault.centos.org/7.7.1908/storage/x86_64/ceph-nautilus/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-storage-gluster-5]
 name=StarlingX-CentOS-7.7.1908 - storage-gluster-5
-baseurl=http://vault.centos.org/7.7.1908/storage/x86_64/gluster-5/
+baseurl=https://vault.centos.org/7.7.1908/storage/x86_64/gluster-5/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-updates]
 name=StarlingX-CentOS-7.7.1908 - updates
-baseurl=http://vault.centos.org/7.7.1908/updates/x86_64/
+baseurl=https://vault.centos.org/7.7.1908/updates/x86_64/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-updates-source]
 name=StarlingX-CentOS-7.7.1908 - updates-source
-baseurl=http://vault.centos.org/7.7.1908/updates/Source/
+baseurl=https://vault.centos.org/7.7.1908/updates/Source/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-virt-kvm]
 name=StarlingX-CentOS-7.7.1908 - virt-kvm
-baseurl=http://vault.centos.org/7.7.1908/virt/x86_64/kvm-common/
+baseurl=https://vault.centos.org/7.7.1908/virt/x86_64/kvm-common/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=1
 
 [StarlingX-C7.7.1908-virt-libvirt]
 name=StarlingX-CentOS-7.7.1908 - virt-libvirt
-baseurl=http://vault.centos.org/7.7.1908/virt/x86_64/libvirt-latest/
+baseurl=https://vault.centos.org/7.7.1908/virt/x86_64/libvirt-latest/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 enabled=0
 
 [StarlingX-C7.7.1908-sclo-rh]
 name=StarlingX-CentOS-7.7.1908 - sclo-rh
-baseurl=http://vault.centos.org/7.7.1908/sclo/x86_64/rh/
+baseurl=https://vault.centos.org/7.7.1908/sclo/x86_64/rh/
 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.8.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.8.repo
new file mode 100644
index 00000000..e90d40ef
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.8.repo
@@ -0,0 +1,164 @@
+########
+# Centos 7.8.2003
+#
+
+[StarlingX-C7.8.2003-atomic]
+name=StarlingX-CentOS-7.8.2003 - atomic
+baseurl=https://vault.centos.org/centos/7.8.2003/atomic/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-centosplus]
+name=StarlingX-CentOS-7.8.2003 - centosplus
+baseurl=https://vault.centos.org/centos/7.8.2003/centosplus/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-centosplus-source]
+name=StarlingX-CentOS-7.8.2003 - centosplus-source
+baseurl=https://vault.centos.org/7.8.2003/centosplus/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-extras]
+name=StarlingX-CentOS-7.8.2003 - extras
+baseurl=https://vault.centos.org/centos/7.8.2003/extras/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-extras-source]
+name=StarlingX-CentOS-7.8.2003 - extras-source
+baseurl=https://vault.centos.org/7.8.2003/extras/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-nfv-fdio]
+name=StarlingX-CentOS-7.8.2003 - nfv
+baseurl=https://vault.centos.org/centos/7.8.2003/nfv/x86_64/fdio/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-opstools]
+name=StarlingX-CentOS-7.8.2003 - opstools
+baseurl=https://vault.centos.org/centos/7.8.2003/opstools/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+# [StarlingX-C7.8.2003-opstools-source]
+# name=StarlingX-CentOS-7.8.2003 - opstools-source
+# baseurl=https://vault.centos.org/7.8.2003/opstools/Source/
+# gpgcheck=1
+# gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+# enabled=1
+
+[StarlingX-C7.8.2003-os]
+name=StarlingX-CentOS-7.8.2003 - os
+baseurl=https://vault.centos.org/centos/7.8.2003/os/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-os-source]
+name=StarlingX-CentOS-7.8.2003 - os-source
+baseurl=https://vault.centos.org/7.8.2003/os/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-paas-openshift-origin]
+name=StarlingX-CentOS-7.8.2003 - paas-openshift-origin
+baseurl=https://vault.centos.org/centos/7.8.2003/paas/x86_64/openshift-origin/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-paas-openshift-origin311]
+name=StarlingX-CentOS-7.8.2003 - paas-openshift-origin311
+baseurl=https://vault.centos.org/centos/7.8.2003/paas/x86_64/openshift-origin311/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-rt]
+name=StarlingX-CentOS-7.8.2003 - rt
+baseurl=https://vault.centos.org/centos/7.8.2003/rt/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-sclo-sclo]
+name=StarlingX-CentOS-7.8.2003 - sclo-sclo
+baseurl=https://vault.centos.org/centos/7.8.2003/sclo/x86_64/sclo/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-storage-ceph-jewel]
+name=StarlingX-CentOS-7.8.2003 - storage-ceph-jewel
+baseurl=https://vault.centos.org/centos/7.8.2003/storage/x86_64/ceph-jewel/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-storage-ceph-luminous]
+name=StarlingX-CentOS-7.8.2003 - storage-ceph-luminous
+baseurl=https://vault.centos.org/centos/7.8.2003/storage/x86_64/ceph-luminous/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-storage-ceph-nautilus]
+name=StarlingX-CentOS-7.8.2003 - storage-ceph-nautilus
+baseurl=https://vault.centos.org/centos/7.8.2003/storage/x86_64/ceph-nautilus/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-storage-gluster-5]
+name=StarlingX-CentOS-7.8.2003 - storage-gluster-5
+baseurl=https://vault.centos.org/centos/7.8.2003/storage/x86_64/gluster-5/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-updates]
+name=StarlingX-CentOS-7.8.2003 - updates
+baseurl=https://vault.centos.org/centos/7.8.2003/updates/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-updates-source]
+name=StarlingX-CentOS-7.8.2003 - updates-source
+baseurl=https://vault.centos.org/7.8.2003/updates/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-virt-kvm]
+name=StarlingX-CentOS-7.8.2003 - virt-kvm
+baseurl=https://vault.centos.org/centos/7.8.2003/virt/x86_64/kvm-common/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.8.2003-virt-libvirt]
+name=StarlingX-CentOS-7.8.2003 - virt-libvirt
+baseurl=https://vault.centos.org/centos/7.8.2003/virt/x86_64/libvirt-latest/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[StarlingX-C7.8.2003-sclo-rh]
+name=StarlingX-CentOS-7.8.2003 - sclo-rh
+baseurl=https://vault.centos.org/centos/7.8.2003/sclo/x86_64/rh/
+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.9.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.9.repo
new file mode 100644
index 00000000..bf65e03a
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-7.9.repo
@@ -0,0 +1,164 @@
+########
+# Centos 7.9.2009
+#
+
+[StarlingX-C7.9.2009-atomic]
+name=StarlingX-CentOS-7.9.2009 - atomic
+baseurl=http://mirror.centos.org/centos/7.9.2009/atomic/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-centosplus]
+name=StarlingX-CentOS-7.9.2009 - centosplus
+baseurl=http://mirror.centos.org/centos/7.9.2009/centosplus/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-centosplus-source]
+name=StarlingX-CentOS-7.9.2009 - centosplus-source
+baseurl=https://vault.centos.org/7.9.2009/centosplus/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-extras]
+name=StarlingX-CentOS-7.9.2009 - extras
+baseurl=http://mirror.centos.org/centos/7.9.2009/extras/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-extras-source]
+name=StarlingX-CentOS-7.9.2009 - extras-source
+baseurl=https://vault.centos.org/7.9.2009/extras/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-nfv-fdio]
+name=StarlingX-CentOS-7.9.2009 - nfv
+baseurl=http://mirror.centos.org/centos/7.9.2009/nfv/x86_64/fdio/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-opstools]
+name=StarlingX-CentOS-7.9.2009 - opstools
+baseurl=http://mirror.centos.org/centos/7.9.2009/opstools/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+# [StarlingX-C7.9.2009-opstools-source]
+# name=StarlingX-CentOS-7.9.2009 - opstools-source
+# baseurl=https://vault.centos.org/7.9.2009/opstools/Source/
+# gpgcheck=1
+# gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+# enabled=1
+
+[StarlingX-C7.9.2009-os]
+name=StarlingX-CentOS-7.9.2009 - os
+baseurl=http://mirror.centos.org/centos/7.9.2009/os/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-os-source]
+name=StarlingX-CentOS-7.9.2009 - os-source
+baseurl=https://vault.centos.org/7.9.2009/os/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-paas-openshift-origin]
+name=StarlingX-CentOS-7.9.2009 - paas-openshift-origin
+baseurl=http://mirror.centos.org/centos/7.9.2009/paas/x86_64/openshift-origin/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-paas-openshift-origin311]
+name=StarlingX-CentOS-7.9.2009 - paas-openshift-origin311
+baseurl=http://mirror.centos.org/centos/7.9.2009/paas/x86_64/openshift-origin311/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-rt]
+name=StarlingX-CentOS-7.9.2009 - rt
+baseurl=http://mirror.centos.org/centos/7.9.2009/rt/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-sclo-sclo]
+name=StarlingX-CentOS-7.9.2009 - sclo-sclo
+baseurl=http://mirror.centos.org/centos/7.9.2009/sclo/x86_64/sclo/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-storage-ceph-jewel]
+name=StarlingX-CentOS-7.9.2009 - storage-ceph-jewel
+baseurl=http://mirror.centos.org/centos/7.9.2009/storage/x86_64/ceph-jewel/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-storage-ceph-luminous]
+name=StarlingX-CentOS-7.9.2009 - storage-ceph-luminous
+baseurl=http://mirror.centos.org/centos/7.9.2009/storage/x86_64/ceph-luminous/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-storage-ceph-nautilus]
+name=StarlingX-CentOS-7.9.2009 - storage-ceph-nautilus
+baseurl=http://mirror.centos.org/centos/7.9.2009/storage/x86_64/ceph-nautilus/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-storage-gluster-5]
+name=StarlingX-CentOS-7.9.2009 - storage-gluster-5
+baseurl=http://mirror.centos.org/centos/7.9.2009/storage/x86_64/gluster-5/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-updates]
+name=StarlingX-CentOS-7.9.2009 - updates
+baseurl=http://mirror.centos.org/centos/7.9.2009/updates/x86_64/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-updates-source]
+name=StarlingX-CentOS-7.9.2009 - updates-source
+baseurl=https://vault.centos.org/7.9.2009/updates/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-virt-kvm]
+name=StarlingX-CentOS-7.9.2009 - virt-kvm
+baseurl=http://mirror.centos.org/centos/7.9.2009/virt/x86_64/kvm-common/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=1
+
+[StarlingX-C7.9.2009-virt-libvirt]
+name=StarlingX-CentOS-7.9.2009 - virt-libvirt
+baseurl=http://mirror.centos.org/centos/7.9.2009/virt/x86_64/libvirt-latest/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+enabled=0
+
+[StarlingX-C7.9.2009-sclo-rh]
+name=StarlingX-CentOS-7.9.2009 - sclo-rh
+baseurl=http://mirror.centos.org/centos/7.9.2009/sclo/x86_64/rh/
+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-8.0.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.0.repo
index 0247693f..723bd48a 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.0.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.0.repo
@@ -111,3 +111,76 @@ baseurl=http://vault.centos.org/8.0.1905/messaging/Source/rabbitmq-38/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+[StarlingX-C8.0.1905-BaseOS]
+name=StarlingX-CentOS-8.0.1905-BaseOS
+baseurl=https://vault.centos.org/8.0.1905/BaseOS/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.0.1905-BaseOS-Source]
+name=StarlingX-CentOS-8.0.1905-Source
+baseurl=https://vault.centos.org/8.0.1905/BaseOS/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.0.1905-AppStream]
+name=StarlingX-CentOS-8.0.1905-AppStream
+baseurl=https://vault.centos.org/8.0.1905/AppStream/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.0.1905-AppStream-Source]
+name=StarlingX-CentOS-8.0.1905-AppStream-Source
+baseurl=https://vault.centos.org/8.0.1905/AppStream/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.0.1905-PowerTools]
+name=StarlingX-CentOS-8.0.1905-PowerTools
+baseurl=https://vault.centos.org/8.0.1905/PowerTools/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.0.1905-PowerTools-Source]
+name=StarlingX-CentOS-8.0.1905-PowerTools-Source
+baseurl=https://vault.centos.org/8.0.1905/PowerTools/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.0.1905-centosplus]
+name=StarlingX-CentOS-8.0.1905-centosplus
+baseurl=https://vault.centos.org/8.0.1905/centosplus/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.0.1905-centosplus-Source]
+name=StarlingX-CentOS-8.0.1905-centosplus-Source
+baseurl=https://vault.centos.org/8.0.1905/centosplus/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.0.1905-extras]
+name=StarlingX-CentOS-8.0.1905-extras
+baseurl=https://vault.centos.org/8.0.1905/extras/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.0.1905-extras-Source]
+name=StarlingX-CentOS-8.0.1905-extras-Source
+baseurl=https://vault.centos.org/8.0.1905/extras/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.1.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.1.repo
index a08c3dd4..33ea6c5e 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.1.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.1.repo
@@ -9,27 +9,6 @@ gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 
-[StarlingX-C8.1.1911-BaseOS]
-name=StarlingX-CentOS8.1.1911-BaseOS
-baseurl=http://vault.centos.org/8.1.1911/BaseOS/x86_64/os/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-enabled=1
-
-[StarlingX-C8.1.1911-PowerTools]
-name=StarlingX-Centos8.1.1911-PowerTools
-baseurl=http://vault.centos.org/8.1.1911/PowerTools/x86_64/os/
-gpgcheck=1
-enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-
-[StarlingX-C8.1.1911-BaseOS-Source]
-name=StarlingX-CentOS8.1.1911-BaseOS Source
-baseurl=http://vault.centos.org/8.1.1911/BaseOS/Source/
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-enabled=1
-
 [StarlingX-C8.1.1911-AppStream-source]
 name=StarlingX-Centos8.1.1911-AppStream-source
 baseurl=http://vault.centos.org/8.1.1911/AppStream/Source/
@@ -37,35 +16,79 @@ gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 
-[StarlingX-C8.1.1911-extras-source]
-name=StarlingX-Centos8.1.1911-extras-source
-baseurl=http://vault.centos.org/8.1.1911/extras/Source/
+[StarlingX-C8.1.1911-BaseOS]
+name=StarlingX-CentOS-8.1.1911-BaseOS
+baseurl=https://vault.centos.org/8.1.1911/BaseOS/x86_64/os/
 gpgcheck=1
-
-[StarlingX-C8.1.1911-centosplus-source]
-name=StarlingX-Centos8.1.1911-centosplus-source
-baseurl=http://vault.centos.org/8.1.1911/centosplus/Source/
-gpgcheck=1
-enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
 
-[StarlingX-C8.1.1911-PowerTools-source]
-name=StarlingX-Centos8.1.1911-PowerTools-source
-baseurl=http://vault.centos.org/8.1.1911/PowerTools/Source/
+[StarlingX-C8.1.1911-BaseOS-Source]
+name=StarlingX-CentOS-8.1.1911-BaseOS-Source
+baseurl=https://vault.centos.org/8.1.1911/BaseOS/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
+
+[StarlingX-C8.1.1911-messaging]
+name=StarlingX-Centos8.1.1911-messaging
+baseurl=http://vault.centos.org/centos/8.1.1911/messaging/x86_64/rabbitmq-38/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 
 [StarlingX-C8.1.1911-HighAvailability]
-name=StarlingX-Centos8.1.1911-HighAvailability
-baseurl=http://vault.centos.org/8.1.1911/HighAvailability/Source/
+name=StarlingX-CentOS-8.1.1911-HighAvailability
+baseurl=https://vault.centos.org/8.1.1911/HighAvailability/x86_64/os/
 gpgcheck=1
-enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
 
-[StarlingX-C8.1.1911-messaging]
-name=StarlingX-Centos8.1.1911-messaging
-baseurl=http://vault.centos.org/8.1.1911/messaging/x86_64/rabbitmq-38/
+[StarlingX-C8.1.1911-HighAvailability-Source]
+name=StarlingX-CentOS-8.1.1911-HighAvailability-Source
+baseurl=https://vault.centos.org/8.1.1911/HighAvailability/Source/
 gpgcheck=1
-enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
+
+[StarlingX-C8.1.1911-PowerTools]
+name=StarlingX-CentOS-8.1.1911-PowerTools
+baseurl=https://vault.centos.org/8.1.1911/PowerTools/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
+
+[StarlingX-C8.1.1911-PowerTools-Source]
+name=StarlingX-CentOS-8.1.1911-PowerTools Source
+baseurl=https://vault.centos.org/8.1.1911/PowerTools/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
+
+[StarlingX-C8.1.1911-centosplus]
+name=StarlingX-CentOS-8.1.1911-centosplus
+baseurl=https://vault.centos.org/8.1.1911/centosplus/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
+
+[StarlingX-C8.1.1911-centosplus-Source]
+name=StarlingX-CentOS-8.1.1911-centosplus Source
+baseurl=https://vault.centos.org/8.1.1911/centosplus/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
+
+[StarlingX-C8.1.1911-extras]
+name=StarlingX-CentOS-8.1.1911-extras
+baseurl=https://vault.centos.org/8.1.1911/extras/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
+
+[StarlingX-C8.1.1911-extras-Source]
+name=StarlingX-CentOS-8.1.1911-extras-Source
+baseurl=https://vault.centos.org/8.1.1911/extras/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.2.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.2.repo
new file mode 100644
index 00000000..416dd8ee
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.2.repo
@@ -0,0 +1,92 @@
+########
+# Centos 8.2.2004
+#
+
+[StarlingX-C8.2.2004-BaseOS]
+name=StarlingX-CentOS-8.2.2004 - BaseOS
+baseurl=https://vault.centos.org/centos/8.2.2004/BaseOS/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.2.2004-BaseOS-Source]
+name=StarlingX-CentOS-8.2.2004 - BaseOS Source
+baseurl=https://vault.centos.org/8.2.2004/BaseOS/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.2.2004-AppStream]
+name=StarlingX-CentOS-8.2.2004 - AppStream
+baseurl=https://vault.centos.org/centos/8.2.2004/AppStream/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.2.2004-AppStream-Source]
+name=StarlingX-CentOS-8.2.2004 - AppStream Source
+baseurl=https://vault.centos.org/8.2.2004/AppStream/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.2.2004-HighAvailability]
+name=StarlingX-CentOS-8.2.2004 - HighAvailability
+baseurl=https://vault.centos.org/centos/8.2.2004/HighAvailability/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.2.2004-HighAvailability-Source]
+name=StarlingX-CentOS-8.2.2004 - HighAvailability Source
+baseurl=https://vault.centos.org/8.2.2004/HighAvailability/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.2.2004-PowerTools]
+name=StarlingX-CentOS-8.2.2004 - PowerTools
+baseurl=https://vault.centos.org/centos/8.2.2004/PowerTools/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.2.2004-PowerTools-Source]
+name=StarlingX-CentOS-8.2.2004 - PowerTools Source
+baseurl=https://vault.centos.org/8.2.2004/PowerTools/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.2.2004-centosplus]
+name=StarlingX-CentOS-8.2.2004 - centosplus
+baseurl=https://vault.centos.org/centos/8.2.2004/centosplus/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.2.2004-centosplus-Source]
+name=StarlingX-CentOS-8.2.2004 - centosplus Source
+baseurl=https://vault.centos.org/8.2.2004/centosplus/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.2.2004-extras]
+name=StarlingX-CentOS-8.2.2004 - extras
+baseurl=https://vault.centos.org/centos/8.2.2004/extras/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.2.2004-extras-Source]
+name=StarlingX-CentOS-8.2.2004 - extras Source
+baseurl=https://vault.centos.org/8.2.2004/extras/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.3.repo b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.3.repo
new file mode 100644
index 00000000..545a20e2
--- /dev/null
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-Centos-8.3.repo
@@ -0,0 +1,92 @@
+########
+# Centos 8.3.2011
+#
+
+[StarlingX-C8.3.2011-BaseOS]
+name=StarlingX-CentOS-8.3.2011 - BaseOS
+baseurl=http://mirror.centos.org/centos/8.3.2011/BaseOS/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.3.2011-BaseOS-Source]
+name=StarlingX-CentOS-8.3.2011 - BaseOS Source
+baseurl=https://vault.centos.org/8.3.2011/BaseOS/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.3.2011-AppStream]
+name=StarlingX-CentOS-8.3.2011 - AppStream
+baseurl=http://mirror.centos.org/centos/8.3.2011/AppStream/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.3.2011-AppStream-Source]
+name=StarlingX-CentOS-8.3.2011 - AppStream Source
+baseurl=https://vault.centos.org/8.3.2011/AppStream/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.3.2011-HighAvailability]
+name=StarlingX-CentOS-8.3.2011 - HighAvailability
+baseurl=http://mirror.centos.org/centos/8.3.2011/HighAvailability/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.3.2011-HighAvailability-Source]
+name=StarlingX-CentOS-8.3.2011 - HighAvailability Source
+baseurl=https://vault.centos.org/8.3.2011/HighAvailability/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.3.2011-PowerTools]
+name=StarlingX-CentOS-8.3.2011 - PowerTools
+baseurl=http://mirror.centos.org/centos/8.3.2011/PowerTools/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.3.2011-PowerTools-Source]
+name=StarlingX-CentOS-8.3.2011 - PowerTools Source
+baseurl=https://vault.centos.org/8.3.2011/PowerTools/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.3.2011-centosplus]
+name=StarlingX-CentOS-8.3.2011 - centosplus
+baseurl=http://mirror.centos.org/centos/8.3.2011/centosplus/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.3.2011-centosplus-Source]
+name=StarlingX-CentOS-8.3.2011 - centosplus Source
+baseurl=https://vault.centos.org/8.3.2011/centosplus/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+
+[StarlingX-C8.3.2011-extras]
+name=StarlingX-CentOS-8.3.2011 - extras
+baseurl=http://mirror.centos.org/centos/8.3.2011/extras/x86_64/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
+
+[StarlingX-C8.3.2011-extras-Source]
+name=StarlingX-CentOS-8.3.2011 - extras Source
+baseurl=https://vault.centos.org/8.3.2011/extras/Source/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
+enabled=1
diff --git a/centos-mirror-tools/yum.repos.d/StarlingX-EPEL-8.repo b/centos-mirror-tools/yum.repos.d/StarlingX-EPEL-8.repo
index 0f2727ea..eb157a4c 100644
--- a/centos-mirror-tools/yum.repos.d/StarlingX-EPEL-8.repo
+++ b/centos-mirror-tools/yum.repos.d/StarlingX-EPEL-8.repo
@@ -15,7 +15,6 @@ gpgcheck=0
 #gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
 enabled=1
 
-
 [Starlingx-epel-8-source]
 name=Starlingx-Epel-8-source
 baseurl=https://dl.fedoraproject.org/pub/epel/8/Everything/SRPMS/
@@ -23,7 +22,6 @@ gpgcheck=0
 #gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-8
 enabled=1
 
-
 [Starlingx-epel-8-testing]
 name=Starlingx-Epel-8-testing
 baseurl=https://dl.fedoraproject.org/pub/epel/testing/8/Everything/x86_64/
@@ -58,17 +56,3 @@ baseurl=https://download.fedoraproject.org/pub/epel/testing/8/Modular/SRPMS
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 de163e15..d3c802fb 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
@@ -28,7 +28,7 @@ exclude=sip,PyQt4
 
 [centos-openstack-Queens-source]
 name=CentOS-7 - OpenStack Queens - Source
-baseurl=http://vault.centos.org/centos/7.5.1804/cloud/Source/openstack-queens/
+baseurl=https://vault.centos.org/centos/7.5.1804/cloud/Source/openstack-queens/
 gpgcheck=1
 enabled=1
 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 b5efa821..cad336e6 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
@@ -28,7 +28,7 @@ exclude=sip,PyQt4
 
 [centos-openstack-Rocky-source]
 name=CentOS-7 - OpenStack Rocky - Source
-baseurl=http://vault.centos.org/centos/7.5.1804/cloud/Source/openstack-rocky/
+baseurl=https://vault.centos.org/centos/7.5.1804/cloud/Source/openstack-rocky/
 gpgcheck=1
 enabled=1
 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 7bd2f642..a32c02f0 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
@@ -28,7 +28,7 @@ exclude=sip,PyQt4
 
 [centos-openstack-Stein-source]
 name=CentOS-7 - OpenStack Stein - Source
-baseurl=http://vault.centos.org/centos/7.6.1810/cloud/Source/openstack-stein/
+baseurl=https://vault.centos.org/centos/7.6.1810/cloud/Source/openstack-stein/
 gpgcheck=1
 enabled=1
 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 13dba5aa..a1e06a67 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
@@ -28,7 +28,7 @@ exclude=sip,PyQt4
 
 [centos-openstack-train-source]
 name=CentOS-7 - OpenStack train - Source
-baseurl=http://vault.centos.org/centos/7.7.1908/cloud/Source/openstack-train/
+baseurl=https://vault.centos.org/centos/7.7.1908/cloud/Source/openstack-train/
 gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
diff --git a/cve_support/cve_policy_filter.py b/cve_support/cve_policy_filter.py
index 7a650edb..dff356d2 100644
--- a/cve_support/cve_policy_filter.py
+++ b/cve_support/cve_policy_filter.py
@@ -118,7 +118,7 @@ def get_affectedpackages(data, cve_id):
     return: affected packages by the CVE and fix/unfix status of each package
     """
     affectedpackages_list = []
-    status_list = []
+    allfixed = "fixed"
     try:
         affectedpackages = data["scannedCves"][cve_id]["affectedPackages"]
     except KeyError:
@@ -126,19 +126,9 @@ def get_affectedpackages(data, cve_id):
     else:
         for pkg in affectedpackages:
             affectedpackages_list.append(pkg["name"])
-            status_list.append(pkg["notFixedYet"])
-    return affectedpackages_list, status_list
-
-def get_status(status_list):
-    """
-    return: status of CVE. If one of the pkgs is not fixed, CVE is not fixed
-    """
-    status = None
-    if True in status_list:
-        status = "unfixed"
-    else:
-        status = "fixed"
-    return status
+            if 'notFixedYet' in pkg and pkg["notFixedYet"] is True:
+                allfixed = "unfixed"
+    return affectedpackages_list, allfixed
 
 def main():
     """
@@ -186,7 +176,7 @@ def main():
     for cve in cves:
         cve_id = cve["id"]
         affectedpackages_list = []
-        status_list = []
+        allfixed = "fixed"
         try:
             nvd2_score = data["scannedCves"][cve_id]["cveContents"]["nvd"]["cvss2Score"]
             cvss2vector = data["scannedCves"][cve_id]["cveContents"]["nvd"]["cvss2Vector"]
@@ -209,9 +199,9 @@ def main():
             cve["ai"] = str(_ai)
             cve["summary"] = get_summary(data, cve_id)
             cve["sourcelink"] = get_source_link(data, cve_id)
-            affectedpackages_list, status_list = get_affectedpackages(data, cve_id)
+            affectedpackages_list, allfixed = get_affectedpackages(data, cve_id)
             cve["affectedpackages"] = affectedpackages_list
-            cve["status"] = get_status(status_list)
+            cve["status"] = allfixed
             cves_valid.append(cve)
 
     for cve in cves_valid:
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 16b52e48..74bd62fb 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,5 @@
-sphinx>=1.6.2
-openstackdocstheme>=1.26.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.2.1 # Apache-2.0
 
 # Release Notes
-reno>=0.1.1 # Apache2
+reno>=3.1.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3d595e82..16c03516 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -27,12 +27,6 @@ project = u'StarlingX Tools'
 copyright = u'2018, StarlingX'
 author = u'StarlingX'
 
-# The short X.Y version
-version = u''
-# The full version, including alpha/beta/rc tags
-release = u'0.1'
-
-
 # -- General configuration ---------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -58,8 +52,10 @@ source_suffix = '.rst'
 # The master toctree document.
 master_doc = 'index'
 
-bug_project = '1027'
-bug_tag = 'stx.bug'
+# openstackdocstheme options
+openstackdocs_repo_name = 'starlingx/tools'
+openstackdocs_use_storyboard = True
+openstackdocs_auto_name = False
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -74,7 +70,7 @@ language = None
 exclude_patterns = []
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 
 # -- Options for HTML output -------------------------------------------------
diff --git a/release/branch-repo.sh b/release/branch-repo.sh
index 59f47711..fb147f3c 100755
--- a/release/branch-repo.sh
+++ b/release/branch-repo.sh
@@ -128,6 +128,7 @@ function branch_repo {
     local sha=$3
     local branch=$4
     local tag=${5:-""}
+    local branch_created=0
 
     local repo_dir
     if [[ -n $SKIP_PATH || "$path" == "-" ]]; then
@@ -154,11 +155,16 @@ function branch_repo {
     if ! git branch | grep ${branch}$; then
         # Create the new branch if it does not exist
         git branch $branch $sha
+        branch_created=1
     fi
 
     if [[ -n $tag ]]; then
         # tag branch point at $sha
-        git tag -s -m "Branch $branch" -f $tag $sha
+        if [ $branch_created -eq 1 ]; then
+            git tag -s -m "Branch $branch" -f $tag $sha
+        else
+            git tag -s -m "Tag $tag Release" -f $tag $sha
+        fi
     fi
 
     # Push the new goodness back up
diff --git a/release/build-context.py b/release/build-context.py
index a5c9b382..46d64978 100755
--- a/release/build-context.py
+++ b/release/build-context.py
@@ -58,7 +58,7 @@ def load_manifest(name):
 
 def load_context(name):
     # Extract the workspace path and git SHA for each repo
-    # (cd ./cgcs-root/stx/stx-config && git checkout -f 22a60625f169202a68b524ac0126afb1d10921cd)\n
+    # (cd ./root/stx/stx-config && git checkout -f 22a60625f169202a68b524ac0126afb1d10921cd)\n
     ctx = {}
     if "://" in name:
         # Open a URL
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index d0871432..9ee0959d 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -31,8 +31,10 @@ extensions = [
     'reno.sphinxext',
 ]
 
-bug_project = '1027'
-bug_tag = 'stx.bug'
+# openstackdocstheme options
+openstackdocs_repo_name = 'starlingx/tools'
+openstackdocs_use_storyboard = True
+openstackdocs_auto_name = False
 
 # Add any paths that contain templates here, relative to this directory.
 # templates_path = ['_templates']
@@ -82,7 +84,7 @@ exclude_patterns = []
 # show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = 'native'
 
 # A list of ignored prefixes for module index sorting.
 # modindex_common_prefix = []
@@ -131,10 +133,6 @@ html_theme = 'starlingxdocs'
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
diff --git a/tb.sh b/tb.sh
index d1c24584..2c40ba34 100755
--- a/tb.sh
+++ b/tb.sh
@@ -26,9 +26,16 @@ TC_CONTAINER_TAG=local/${MYUNAME}-stx-builder:8.1.1911
 TC_DOCKERFILE=Dockerfile
 
 function create_container {
+    local EXTRA_ARGS=""
+
+    if [ ! -z ${MY_EMAIL} ]; then
+        EXTRA_ARGS="--build-arg MY_EMAIL=${MY_EMAIL}"
+    fi
+
     docker build \
         --build-arg MYUID=$(id -u) \
         --build-arg MYUNAME=${USER} \
+        ${EXTRA_ARGS} \
         --ulimit core=0 \
         --network host \
         -t ${TC_CONTAINER_TAG} \
@@ -37,6 +44,7 @@ function create_container {
 }
 
 function exec_container {
+    echo "docker cp ${WORK_DIR}/buildrc ${TC_CONTAINER_NAME}:/home/${MYUNAME}"
     docker cp ${WORK_DIR}/buildrc ${TC_CONTAINER_NAME}:/home/${MYUNAME}
     docker cp ${WORK_DIR}/localrc ${TC_CONTAINER_NAME}:/home/${MYUNAME}
     docker exec -it --user=${MYUNAME} -e MYUNAME=${MYUNAME} ${TC_CONTAINER_NAME} script -q -c "/bin/bash" /dev/null
@@ -52,7 +60,7 @@ function run_container {
         --name ${TC_CONTAINER_NAME} \
         --detach \
         -v /var/run/docker.sock:/var/run/docker.sock \
-        -v ${LOCALDISK}:/${GUEST_LOCALDISK} \
+        -v $(readlink -f ${LOCALDISK}):/${GUEST_LOCALDISK} \
         -v ${HOST_MIRROR_DIR}:/import/mirrors:ro \
         -v /sys/fs/cgroup:/sys/fs/cgroup:ro \
         -v ~/.ssh:/mySSH:ro \
@@ -93,6 +101,8 @@ case $CMD in
         echo "MY_RELEASE=${MY_RELEASE}"
         echo "MY_REPO_ROOT_DIR=${MY_REPO_ROOT_DIR}"
         echo "LAYER=${LAYER}"
+        echo "MYUNAME=${MYUNAME}"
+        echo "MY_EMAIL=${MY_EMAIL}"
         ;;
     create)
         create_container
diff --git a/toCOPY/finishSetup.sh b/toCOPY/finishSetup.sh
index 82826c5e..b8de405a 100755
--- a/toCOPY/finishSetup.sh
+++ b/toCOPY/finishSetup.sh
@@ -27,7 +27,7 @@ mkdir -p /localdisk/loadbuild/mock-cache
 sudo chmod 775 /localdisk/loadbuild/mock-cache
 sudo chown root:mock /localdisk/loadbuild/mock-cache
 ### may need to add these later. once it works will try on clean localdisk setup
-# [builder@bavery-WS-DESK cgcs-root]$ history | grep mkdir
+# [builder@bavery-WS-DESK root]$ history | grep mkdir
 # 55  mkdir -p $MY_WORKSPACE/results
 # 66  mkdir -p $MY_WORKSPACE/std/results/$MY_BUILD_ENVIRONMENT-std
 # 78  mkdir -p $MY_WORKSPACE/rt/rpmbuild/RPMS
diff --git a/toCOPY/generate-centos-repo.sh b/toCOPY/generate-centos-repo.sh
new file mode 100755
index 00000000..deedaa75
--- /dev/null
+++ b/toCOPY/generate-centos-repo.sh
@@ -0,0 +1,504 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (C) 2019 Intel Corporation
+#
+
+GENERATE_CENTOS_REPO_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
+
+source $GENERATE_CENTOS_REPO_DIR/lst_utils.sh
+
+mirror_dir=""
+layer_dirs=""
+
+CREATEREPO=$(which createrepo_c)
+if [ $? -ne 0 ]; then
+    CREATEREPO="createrepo"
+fi
+
+usage () {
+    echo
+    echo "Create a virtual rpm repo containing only rpms listed in various lst files."
+    echo "The virtual repo contains only symlinks to to previously downloaded or built rpms."
+    echo
+    echo "Usage"
+    echo
+    echo "$0 [Options] [ --mirror-dir=<mirror-path> | <mirror-path> ]"
+    echo
+    echo "Commin Options:"
+    echo "  --distro=<distro>:  Create repo for the designated distro."
+    echo "                      Default 'centos'"
+    echo "  --layer=<layer>:    Create a smaller repo, sufficient to build"
+    echo "                      only the given layer."
+    echo "                      Default: use the LAYER environmnet valiable, or 'all'."
+    echo "  --mirror-dir=<dir>: Set the mirror directory.  This is where"
+    echo "                      the previously downloaded rpms are located."
+    echo
+    echo "Override options: For use when working on a multi-layer change"
+    echo "  --config-dir=<dir>: Use an alternate config directory rather than the"
+    echo "                      system defined one"
+    echo "  --layer-inc-url=<lower_layer>,<build_type>,<url>:"
+    echo "                      Override the url for the image include file of a lower"
+    echo "                      layer's build type.  Normally the url(s) is read from"
+    echo "                      <config_dir>/<distro>/<layer>/required_layer_iso_inc.cfg"
+    echo "                      This option can be used more than once."
+    echo "  --layer-pkg-url=<lower_layer>,<build_type>,<url>:"
+    echo "                      Override the url for the package list of a lower"
+    echo "                      layer's build type.  Normally the url(s) is read from"
+    echo "                      <config_dir>/<distro>/<layer>/required_layer_pkgs.cfg."
+    echo "                      This option can be used more than once."
+    echo "  --layer-wheels-inc-url=<lower_layer>,<stream>,<url>:"
+    echo "                      Override the url for the image include file of a lower"
+    echo "                      layer's build type.  Normally the url(s) is read from"
+    echo "                      <config_dir>/<distro>/<layer>/required_layer_wheel_inc.cfg"
+    echo "                      This option can be used more than once."
+    echo "  --layer-dir=<dir>:  Look in provided dir for packages to link to."
+    echo "                      This option can be used more than once."
+    echo
+}
+
+cleanup () {
+    if [ -e "${mirror_content}" ]; then
+        \rm -f ${mirror_content}
+    fi
+    if [ -e "${TMP_LST_DIR}" ]; then
+        \rm -rf ${TMP_LST_DIR}
+    fi
+}
+
+trap "cleanup ; exit 1" INT
+
+if [ -z "$MY_REPO" ]; then
+    echo "\$MY_REPO is not set. Ensure you are running this script"
+    echo "from the container and \$MY_REPO points to the root of"
+    echo "your folder tree."
+    exit -1
+fi
+
+TEMP=$(getopt -o h --long help,config-dir:,distro:,layer:,layer-dir:,layer-inc-url:,layer-pkg-url:,layer-wheels-inc-url:,mirror-dir: -n 'generate-centos-repo' -- "$@")
+if [ $? -ne 0 ]; then
+    echo "getopt error"
+    usage
+    exit 1
+fi
+eval set -- "$TEMP"
+
+
+while true ; do
+    case "$1" in
+        --mirror-dir)     mirror_dir=$2 ; shift 2 ;;
+        --layer-dir)      layer_dirs+=" ${2/,/ }" ; shift 2 ;;
+        --layer-inc-url)  set_layer_image_inc_urls "${2}" ; shift 2 ;;
+        --layer-wheels-inc-url)  set_layer_wheels_inc_urls "${2}" ; shift 2 ;;
+        --layer-pkg-url)  set_layer_pkg_urls "${2}" ; shift 2 ;;
+        --config-dir)     set_and_validate_config_dir "${2}"; shift 2 ;;
+        --distro)         set_and_validate_distro "${2}"; shift 2 ;;
+        --layer)          set_and_validate_layer "${2}"; shift 2 ;;
+        -h|--help)        echo "help"; usage; exit 0 ;;
+        --)               shift ; break ;;
+        *)                usage; exit 1 ;;
+    esac
+done
+
+if [ "$mirror_dir" == "" ]; then
+    if [ $# -ne 1 ]; then
+        usage
+        exit -1
+    fi
+
+    mirror_dir=$1
+fi
+
+echo "mirror_dir=${mirror_dir}"
+echo "config_dir=${config_dir}"
+echo "distro=${distro}"
+echo "layer=${layer}"
+echo
+echo "layer_pkg_urls=${layer_pkg_urls[@]}"
+echo
+echo "layer_image_inc_urls=${layer_image_inc_urls[@]}"
+echo
+echo "layer_wheels_inc_urls=${layer_wheels_inc_urls[@]}"
+echo
+
+dest_dir=$MY_REPO/centos-repo
+timestamp="$(date +%F_%H%M)"
+
+mock_cfg_prefix="mock.cfg"
+mock_cfg_default_suffix="proto"
+mock_cfg_suffix="${mock_cfg_default_suffix}"
+if [ -f /etc/os-release ]; then
+    mock_cfg_distro="$(source /etc/os-release; echo ${ID}${VERSION_ID}.proto)"
+fi
+mock_cfg_dir=$MY_REPO/build-tools/repo_files
+mock_cfg_dest_dir=$MY_REPO/centos-repo
+comps_xml_file=$MY_REPO/build-tools/repo_files/comps.xml
+comps_xml_dest_dir=$MY_REPO/centos-repo/Binary
+
+TMP_LST_DIR=$(mktemp -d /tmp/tmp_lst_dir_XXXXXX)
+mkdir -p $TMP_LST_DIR
+lst_file_dir="$TMP_LST_DIR"
+inc_file_dir="${dest_dir}/layer_image_inc"
+wheels_file_dir="${dest_dir}/layer_wheels_inc"
+build_info_file_dir="${dest_dir}/layer_build_info"
+
+rpm_lst_files="rpms_3rdparties.lst rpms_centos3rdparties.lst rpms_centos.lst"
+rpm_lst_files_rt=""
+other_lst_file="other_downloads.lst"
+
+for template in $rpm_lst_files $other_lst_file; do
+    lst="$lst_file_dir/${template}"
+    merge_lst ${config_dir} ${distro} ${template} > ${lst}
+done
+
+missing_rpms_file=missing.txt
+
+\rm -f ${missing_rpms_file}
+
+# Strip trailing / from mirror_dir if it was specified...
+mirror_dir=$(readlink -f ${mirror_dir} | sed "s%/$%%")
+
+if [[ ( ! -d ${mirror_dir}/Binary ) || ( ! -d ${mirror_dir}/Source ) ]]; then
+    echo "The mirror ${mirror_dir} doesn't has the Binary and Source"
+    echo "folders. Please provide a valid mirror"
+    exit -1
+fi
+
+for layer_dir in ${layer_dirs}; do
+    if [ ! -d ${layer_dir} ]; then
+        echo "The layer-dir ${layer_dir} doesn't exist"
+        exit -1
+    fi
+done
+
+if [ ! -d "${dest_dir}" ]; then
+    mkdir -p "${dest_dir}"
+fi
+
+for t in "Binary" "Source" ; do
+    target_dir=${dest_dir}/$t
+    if [ ! -d "$target_dir" ]; then
+        mkdir -p "$target_dir"
+    else
+        mv -f "$target_dir" "$target_dir-backup-$timestamp"
+        mkdir -p "$target_dir"
+    fi
+done
+
+#
+# Dowload image inc files from layer_image_inc_urls
+#
+\rm -rf ${inc_file_dir}
+mkdir -p ${inc_file_dir}
+for key in "${!layer_image_inc_urls[@]}"; do
+    lower_layer="${key%,*}"
+    inc_type="${key#*,}"
+    url="${layer_image_inc_urls[${key}]}"
+    name_from_url=$(url_to_file_name "${url}")
+
+    if [ "${inc_type}" == "std" ]; then
+        ideal_name="${lower_layer}_${image_inc_from_layer_build_template}"
+    elif [ "${inc_type}" == "dev" ]; then
+        ideal_name="${lower_layer}_${dev_image_inc_from_layer_build_template}"
+    else
+        ideal_name="${lower_layer}_${inc_type}_${image_inc_from_layer_build_template}"
+    fi
+
+    list="${ideal_name}"
+
+    for f in $(find -L ${layer_dirs} ${mirror_dir} -type f -name "${name_from_url}"); do
+        cp $f ${inc_file_dir}/${list}
+        if [ $? -ne 0 ]; then
+            echo "WARNING: Failed to copy from cached file '$f' to satisfy url '${url}'"
+        fi
+    done
+
+    if [ ! -f ${inc_file_dir}/${list} ]; then
+        curl --silent --fail ${url} > ${inc_file_dir}/${list}
+        if [ $? -ne 0 ]; then
+            echo "ERROR: Failed to download from url '${url}'"
+            exit 1
+        fi
+    fi
+done
+
+#
+# Dowload wheels inc files from layer_wheels_inc_urls
+#
+\rm -rf ${wheels_file_dir}
+mkdir -p ${wheels_file_dir}
+for key in "${!layer_wheels_inc_urls[@]}"; do
+    lower_layer="${key%,*}"
+    stream="${key#*,}"
+    url="${layer_wheels_inc_urls[${key}]}"
+    name_from_url=$(url_to_file_name "${url}")
+
+    ideal_name="${lower_layer}_${distro}_${stream}_${wheels_inc_from_layer_build_template}"
+
+    list="${ideal_name}"
+
+    for f in $(find -L ${layer_dirs} ${mirror_dir} -type f -name "${name_from_url}"); do
+        cp $f ${wheels_file_dir}/${list}
+        if [ $? -ne 0 ]; then
+            echo "WARNING: Failed to copy from cached file '$f' to satisfy url '${url}'"
+        fi
+    done
+
+    if [ ! -f ${wheels_file_dir}/${list} ]; then
+        curl --silent --fail ${url} > ${wheels_file_dir}/${list}
+        if [ $? -ne 0 ]; then
+            echo "ERROR: Failed to download from url '${url}'"
+            exit 1
+        fi
+    fi
+done
+
+#
+# Dowload build info files
+#
+build_info_from_layer_build_template="BUILD_INFO"
+\rm -rf ${build_info_file_dir}
+mkdir -p ${build_info_file_dir}
+for key in "${!layer_image_inc_urls[@]}"; do
+    lower_layer="${key%,*}"
+    inc_type="${key#*,}"
+
+    if [ "${inc_type}" != "std" ]; then
+        continue
+    fi
+
+    if [ "$(basename ${layer_image_inc_urls[${key}]})" != "image.inc" ]; then
+        continue
+    fi
+
+    url=$( echo ${layer_image_inc_urls[${key}]} | sed 's#image.inc$#BUILD_INFO#' )
+    name_from_url=$(url_to_file_name "${url}")
+    ideal_name="${lower_layer}_${build_info_from_layer_build_template}"
+
+    list="${ideal_name}"
+
+    for f in $(find -L ${layer_dirs} ${mirror_dir} -type f -name "${name_from_url}"); do
+        cp $f ${build_info_file_dir}/${list}
+        if [ $? -ne 0 ]; then
+            echo "WARNING: Failed to copy from cached file '$f' to satisfy url '${url}'"
+        fi
+    done
+
+    if [ ! -f ${build_info_file_dir}/${list} ]; then
+        curl --silent --fail ${url} > ${build_info_file_dir}/${list}
+        if [ $? -ne 0 ]; then
+            echo "WARNING: Failed to download from url '${url}'"
+        fi
+    fi
+done
+
+
+#
+# Dowload lst files from layer_pkg_urls
+#
+for key in "${!layer_pkg_urls[@]}"; do
+    lower_layer="${key%,*}"
+    build_type="${key#*,}"
+    url="${layer_pkg_urls[${key}]}"
+    name_from_url=$(url_to_file_name "${url}")
+    ideal_name="${lower_layer}_${build_type}_${rpms_from_layer_build_template}"
+    list="${ideal_name}"
+
+    for f in $(find -L ${layer_dirs} ${mirror_dir} -type f -name "${name_from_url}"); do
+        cp $f ${lst_file_dir}/${list}
+        if [ $? -ne 0 ]; then
+            echo "WARNING: Failed to copy from cached file '$f' to satisfy url '${url}'"
+        fi
+    done
+
+    if [ ! -f ${lst_file_dir}/${list} ]; then
+        curl --silent --fail ${url} > ${lst_file_dir}/${list}
+        if [ $? -ne 0 ]; then
+            echo "ERROR: Failed to download from url '${url}'"
+            exit 1
+        fi
+    fi
+
+    if [ "${build_type}" == "rt" ]; then
+        rpm_lst_files_rt+=" ${list}"
+    else
+        rpm_lst_files+=" ${list}"
+    fi
+
+    url_type=${url%%:*}
+    if [ "${url_type}" == "file" ]; then
+        url_dir=$(dirname ${url#file://})
+        if [ ! -d ${url_dir} ]; then
+            echo "ERROR: No such directory '${url_dir}' derived from url: ${url}"
+            exit 1
+        fi
+        layer_dirs+=" ${url_dir}"
+    fi
+done
+
+echo "rpm_lst_files=${rpm_lst_files}"
+echo "rpm_lst_files_rt=${rpm_lst_files_rt}"
+echo "layer_dirs=${layer_dirs}"
+
+mirror_content=$(mktemp -t centos-repo-XXXXXX)
+find -L ${layer_dirs} ${mirror_dir} -type f -name '*.rpm' > ${mirror_content}
+
+sed_expression=""
+for d in ${mirror_dir} ${layer_dirs}; do
+    sed_expression+=" -e s%^${d}/%%"
+done
+
+
+process_lst_file () {
+    local lst_file="${1}"
+    local dest_dir="${2}"
+
+    grep -v "^#" ${lst_file_dir}/${lst_file} | while IFS="#" read rpmname extrafields; do
+        if [ -z "${rpmname}" ]; then
+            continue
+        fi
+
+        mirror_file=$(grep "/${rpmname}$" ${mirror_content} | head -n 1)
+        if [ -z "${mirror_file}" ]; then
+            echo "Error -- could not find requested ${rpmname} in ${mirror_dir}"
+            echo ${rpmname} >> ${missing_rpms_file}
+            continue
+        fi
+
+        # Great, we found the file!  Let's strip the mirror_dir prefix from it...
+        ff=$(echo ${mirror_file} | sed ${sed_expression})
+        f_name=$(basename "$ff")
+        arch=$(echo ${f_name} | rev | cut -d '.' -f 2 | rev)
+        if [ "${arch}" == "src" ]; then
+            sub_dir="Source"
+        else
+            sub_dir="Binary/${arch}"
+        fi
+
+        # Make sure we have a subdir (so we don't symlink the first file as
+        # the subdir name)
+        mkdir -p ${dest_dir}/${sub_dir}
+
+        # Link it!
+        echo "Creating symlink for ${dest_dir}/${sub_dir}/${f_name}"
+        ln -sf "${mirror_file}" "${dest_dir}/${sub_dir}/${f_name}"
+        if [ $? -ne 0 ]; then
+            echo "Failed ${mirror_file}: ln -sf \"${mirror_file}\" \"${dest_dir}/${sub_dir}\""
+        fi
+    done
+}
+
+#
+# copy_with_backup: Copy a file to a directory or file.
+#                   If the file already exists at the destination,
+#                   a timestamped backup is created of the
+#                   prior file content by adding a
+#                   -backup-<timestamp> suffic to the file name.
+#
+# Usage:
+#    copy_with_backup <src-file> <dest-dir>
+#    copy_with_backup <src-file> <dest-file>
+#
+copy_with_backup () {
+    local src_file="$1"
+    local dest_dir="$2"
+    local dest_file=${dest_dir}/$(basename ${src_file})
+
+    if [ ! -f "${src_file}" ]; then
+        echo "source file '${src_file}' does not exist!"
+        exit 1
+    fi
+
+    if [ ! -d ${dest_dir} ]; then
+        dest_file="$2"
+        dest_dir=$(dir_name ${dest_file})
+        if [ ! -d ${dest_dir} ]; then
+            echo "destination directory '${dest_dir}' does not exist!"
+            exit 1
+        fi
+    fi
+
+    if [ -f "${dest_file}" ]; then
+        \mv -f -v "${dest_file}" "${dest_file}-backup-${timestamp}"
+    fi
+
+    \cp -v "${src_file}" "${dest_file}"
+    if [ $? -ne 0 ]; then
+        echo "failed to copy '${src_file} into directory '${dest_dir}'"
+        exit 1
+    fi
+}
+
+for lst_file in ${rpm_lst_files} ; do
+    process_lst_file "${lst_file}" "${dest_dir}" || exit 1
+done
+
+for lst_file in ${rpm_lst_files_rt} ; do
+    process_lst_file "${lst_file}" "${dest_dir}/rt" || exit 1
+done
+
+
+echo "Copying comps.xml file."
+
+copy_with_backup ${comps_xml_file} ${comps_xml_dest_dir}
+
+
+echo "Createing yum repodata."
+
+for subdir in Source Binary; do
+    repo_dir="${dest_dir}/${subdir}"
+    mkdir -p "${repo_dir}"
+    if [ -f "${repo_dir}/comps.xml" ]; then
+        ${CREATEREPO} -g "${repo_dir}/comps.xml" -d "${repo_dir}"
+    else
+        ${CREATEREPO} -d "${repo_dir}"
+    fi
+
+    repo_dir="${dest_dir}/rt/${subdir}"
+    mkdir -p "${repo_dir}"
+    if [ -f "${repo_dir}/comps.xml" ]; then
+        ${CREATEREPO} -g "${repo_dir}/comps.xml" -d "${repo_dir}"
+    else
+        ${CREATEREPO} -d "${repo_dir}"
+    fi
+done
+
+
+echo "Copying mock.cfg.proto file."
+
+# First look for layer specific file to copy.
+mock_cfg_file="${mock_cfg_dir}/${mock_cfg_prefix}.${layer}.${mock_cfg_suffix}"
+if [ -f "$mock_cfg_file" ]; then
+    copy_with_backup ${mock_cfg_file} ${mock_cfg_dest_dir}/${mock_cfg_prefix}.${layer}.${mock_cfg_default_suffix}
+fi
+
+# Always copy the default
+mock_cfg_file=${mock_cfg_dir}/${mock_cfg_prefix}.${mock_cfg_suffix}
+copy_with_backup ${mock_cfg_file} ${mock_cfg_dest_dir}/${mock_cfg_prefix}.${mock_cfg_default_suffix}
+
+
+echo "Copying contents from other list files."
+
+# Populate the contents from other list files
+cat ${lst_file_dir}/${other_lst_file} | grep -v "#" | while IFS=":" read targettype item extrafields; do
+    if [ "${targettype}" == "folder" ]; then
+        echo "Creating folder ${item}"
+        mkdir -p $MY_REPO/centos-repo/Binary/${item}
+    fi
+
+    if [ "${targettype}" == "file" ]; then
+        mkdir -p $MY_REPO/centos-repo/Binary/$(dirname ${item})
+        echo "Creating symlink for $MY_REPO/centos-repo/Binary/${item}"
+        ln -sf ${mirror_dir}/Binary/${item} $MY_REPO/centos-repo/Binary/${item}
+    fi
+done
+
+echo "Done creating repo directory"
+declare -i missing_rpms_file_count=$(wc -l ${missing_rpms_file} 2>/dev/null | awk '{print $1}')
+if [ ${missing_rpms_file_count} -gt 0 ]; then
+    echo "WARNING: Some targets could not be found.  Your repo may be incomplete."
+    echo "Missing targets:"
+    cat ${missing_rpms_file}
+    exit 1
+fi
diff --git a/toCOPY/generate-cgcs-centos-repo.sh b/toCOPY/generate-cgcs-centos-repo.sh
index f3dbf3c2..7d3a554a 100755
--- a/toCOPY/generate-cgcs-centos-repo.sh
+++ b/toCOPY/generate-cgcs-centos-repo.sh
@@ -2,462 +2,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright (C) 2019 Intel Corporation
+# Copyright (c) 2020 Wind River Systems, Inc.
 #
 
+# This file included for backward compatibility, and
+# should be removed after a reasonable time.
+
+
 GENERATE_CGCS_CENTOS_REPO_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 
-source $GENERATE_CGCS_CENTOS_REPO_DIR/lst_utils.sh
-
-mirror_dir=""
-layer_dirs=""
-
-CREATEREPO=$(which createrepo_c)
-if [ $? -ne 0 ]; then
-    CREATEREPO="createrepo"
-fi
-
-usage () {
-    echo
-    echo "Create a virtual rpm repo containing only rpms listed in various lst files."
-    echo "The virtual repo contains only symlinks to to previously downloaded or built rpms."
-    echo
-    echo "Usage"
-    echo
-    echo "$0 [Options] [ --mirror-dir=<mirror-path> | <mirror-path> ]"
-    echo
-    echo "Commin Options:"
-    echo "  --distro=<distro>:  Create repo for the designated distro."
-    echo "                      Default 'centos'"
-    echo "  --layer=<layer>:    Create a smaller repo, sufficient to build"
-    echo "                      only the given layer."
-    echo "                      Default: use the LAYER environmnet valiable, or 'all'."
-    echo "  --mirror-dir=<dir>: Set the mirror directory.  This is where"
-    echo "                      the previously downloaded rpms are located."
-    echo
-    echo "Override options: For use when working on a multi-layer change"
-    echo "  --config-dir=<dir>: Use an alternate config directory rather than the"
-    echo "                      system defined one"
-    echo "  --layer-inc-url=<lower_layer>,<build_type>,<url>:"
-    echo "                      Override the url for the image include file of a lower"
-    echo "                      layer's build type.  Normally the url(s) is read from"
-    echo "                      <config_dir>/<distro>/<layer>/required_layer_iso_inc.cfg"
-    echo "                      This option can be used more than once."
-    echo "  --layer-pkg-url=<lower_layer>,<build_type>,<url>:"
-    echo "                      Override the url for the package list of a lower"
-    echo "                      layer's build type.  Normally the url(s) is read from"
-    echo "                      <config_dir>/<distro>/<layer>/required_layer_pkgs.cfg."
-    echo "                      This option can be used more than once."
-    echo "  --layer-wheels-inc-url=<lower_layer>,<stream>,<url>:"
-    echo "                      Override the url for the image include file of a lower"
-    echo "                      layer's build type.  Normally the url(s) is read from"
-    echo "                      <config_dir>/<distro>/<layer>/required_layer_wheel_inc.cfg"
-    echo "                      This option can be used more than once."
-    echo "  --layer-dir=<dir>:  Look in provided dir for packages to link to."
-    echo "                      This option can be used more than once."
-    echo
-}
-
-cleanup () {
-    if [ -e "${mirror_content}" ]; then
-        \rm -f ${mirror_content}
-    fi
-    if [ -e "${TMP_LST_DIR}" ]; then
-        \rm -rf ${TMP_LST_DIR}
-    fi
-}
-
-trap "cleanup ; exit 1" INT
-
-if [ -z "$MY_REPO" ]; then
-    echo "\$MY_REPO is not set. Ensure you are running this script"
-    echo "from the container and \$MY_REPO points to the root of"
-    echo "your folder tree."
-    exit -1
-fi
-
-
-TEMP=$(getopt -o h --long help,config-dir:,distro:,layer:,layer-dir:,layer-inc-url:,layer-pkg-url:,layer-wheels-inc-url:,mirror-dir: -n 'generate-cgcs-centos-repo' -- "$@")
-if [ $? -ne 0 ]; then
-    echo "getopt error"
-    usage
-    exit 1
-fi
-eval set -- "$TEMP"
-
-
-while true ; do
-    case "$1" in
-        --mirror-dir)     mirror_dir=$2 ; shift 2 ;;
-        --layer-dir)      layer_dirs+=" ${2/,/ }" ; shift 2 ;;
-        --layer-inc-url)  set_layer_image_inc_urls "${2}" ; shift 2 ;;
-        --layer-wheels-inc-url)  set_layer_wheels_inc_urls "${2}" ; shift 2 ;;
-        --layer-pkg-url)  set_layer_pkg_urls "${2}" ; shift 2 ;;
-        --config-dir)     set_and_validate_config_dir "${2}"; shift 2 ;;
-        --distro)         set_and_validate_distro "${2}"; shift 2 ;;
-        --layer)          set_and_validate_layer "${2}"; shift 2 ;;
-        -h|--help)        echo "help"; usage; exit 0 ;;
-        --)               shift ; break ;;
-        *)                usage; exit 1 ;;
-    esac
-done
-
-if [ "$mirror_dir" == "" ]; then
-    if [ $# -ne 1 ]; then
-        usage
-        exit -1
-    fi
-
-    mirror_dir=$1
-fi
-
-echo "mirror_dir=${mirror_dir}"
-echo "config_dir=${config_dir}"
-echo "distro=${distro}"
-echo "layer=${layer}"
-echo
-echo "layer_pkg_urls=${layer_pkg_urls[@]}"
-echo
-echo "layer_image_inc_urls=${layer_image_inc_urls[@]}"
-echo
-echo "layer_wheels_inc_urls=${layer_wheels_inc_urls[@]}"
-echo
-
-dest_dir=$MY_REPO/cgcs-centos-repo
-timestamp="$(date +%F_%H%M)"
-mock_cfg_file=$MY_REPO/build-tools/repo_files/mock.cfg.proto
-comps_xml_file=$MY_REPO/build-tools/repo_files/comps.xml
-mock_cfg_dest_file=$MY_REPO/cgcs-centos-repo/mock.cfg.proto
-comps_xml_dest_file=$MY_REPO/cgcs-centos-repo/Binary/comps.xml
-
-TMP_LST_DIR=$(mktemp -d /tmp/tmp_lst_dir_XXXXXX)
-mkdir -p $TMP_LST_DIR
-lst_file_dir="$TMP_LST_DIR"
-inc_file_dir="${dest_dir}/layer_image_inc"
-wheels_file_dir="${dest_dir}/layer_wheels_inc"
-build_info_file_dir="${dest_dir}/layer_build_info"
-
-rpm_lst_files="rpms_3rdparties.lst rpms_centos3rdparties.lst rpms_centos.lst"
-rpm_lst_files_rt=""
-other_lst_file="other_downloads.lst"
-
-for template in $rpm_lst_files $other_lst_file; do
-    lst="$lst_file_dir/${template}"
-    merge_lst ${config_dir} ${distro} ${template} > ${lst}
-done
-
-missing_rpms_file=missing.txt
-
-\rm -f ${missing_rpms_file}
-
-# Strip trailing / from mirror_dir if it was specified...
-mirror_dir=$(readlink -f ${mirror_dir} | sed "s%/$%%")
-
-if [[ ( ! -d ${mirror_dir}/Binary ) || ( ! -d ${mirror_dir}/Source ) ]]; then
-    echo "The mirror ${mirror_dir} doesn't has the Binary and Source"
-    echo "folders. Please provide a valid mirror"
-    exit -1
-fi
-
-for layer_dir in ${layer_dirs}; do
-    if [ ! -d ${layer_dir} ]; then
-        echo "The layer-dir ${layer_dir} doesn't exist"
-        exit -1
-    fi
-done
-
-if [ ! -d "${dest_dir}" ]; then
-    mkdir -p "${dest_dir}"
-fi
-
-for t in "Binary" "Source" ; do
-    target_dir=${dest_dir}/$t
-    if [ ! -d "$target_dir" ]; then
-        mkdir -p "$target_dir"
-    else
-        mv -f "$target_dir" "$target_dir-backup-$timestamp"
-        mkdir -p "$target_dir"
-    fi
-done
-
-#
-# Dowload image inc files from layer_image_inc_urls
-#
-\rm -rf ${inc_file_dir}
-mkdir -p ${inc_file_dir}
-for key in "${!layer_image_inc_urls[@]}"; do
-    lower_layer="${key%,*}"
-    inc_type="${key#*,}"
-    url="${layer_image_inc_urls[${key}]}"
-    name_from_url=$(url_to_file_name "${url}")
-
-    if [ "${inc_type}" == "std" ]; then
-        ideal_name="${lower_layer}_${image_inc_from_layer_build_template}"
-    elif [ "${inc_type}" == "dev" ]; then
-        ideal_name="${lower_layer}_${dev_image_inc_from_layer_build_template}"
-    else
-        ideal_name="${lower_layer}_${inc_type}_${image_inc_from_layer_build_template}"
-    fi
-
-    list="${ideal_name}"
-
-    for f in $(find -L ${layer_dirs} ${mirror_dir} -type f -name "${name_from_url}"); do
-        cp $f ${inc_file_dir}/${list}
-        if [ $? -ne 0 ]; then
-            echo "WARNING: Failed to copy from cached file '$f' to satisfy url '${url}'"
-        fi
-    done
-
-    if [ ! -f ${inc_file_dir}/${list} ]; then
-        curl --silent --fail ${url} > ${inc_file_dir}/${list}
-        if [ $? -ne 0 ]; then
-            echo "ERROR: Failed to download from url '${url}'"
-            exit 1
-        fi
-    fi
-done
-
-#
-# Dowload wheels inc files from layer_wheels_inc_urls
-#
-\rm -rf ${wheels_file_dir}
-mkdir -p ${wheels_file_dir}
-for key in "${!layer_wheels_inc_urls[@]}"; do
-    lower_layer="${key%,*}"
-    stream="${key#*,}"
-    url="${layer_wheels_inc_urls[${key}]}"
-    name_from_url=$(url_to_file_name "${url}")
-
-    ideal_name="${lower_layer}_${distro}_${stream}_${wheels_inc_from_layer_build_template}"
-
-    list="${ideal_name}"
-
-    for f in $(find -L ${layer_dirs} ${mirror_dir} -type f -name "${name_from_url}"); do
-        cp $f ${wheels_file_dir}/${list}
-        if [ $? -ne 0 ]; then
-            echo "WARNING: Failed to copy from cached file '$f' to satisfy url '${url}'"
-        fi
-    done
-
-    if [ ! -f ${wheels_file_dir}/${list} ]; then
-        curl --silent --fail ${url} > ${wheels_file_dir}/${list}
-        if [ $? -ne 0 ]; then
-            echo "ERROR: Failed to download from url '${url}'"
-            exit 1
-        fi
-    fi
-done
-
-#
-# Dowload build info files
-#
-build_info_from_layer_build_template="BUILD_INFO"
-\rm -rf ${build_info_file_dir}
-mkdir -p ${build_info_file_dir}
-for key in "${!layer_image_inc_urls[@]}"; do
-    lower_layer="${key%,*}"
-    inc_type="${key#*,}"
-
-    if [ "${inc_type}" != "std" ]; then
-        continue
-    fi
-
-    if [ "$(basename ${layer_image_inc_urls[${key}]})" != "image.inc" ]; then
-        continue
-    fi
-
-    url=$( echo ${layer_image_inc_urls[${key}]} | sed 's#image.inc$#BUILD_INFO#' )
-    name_from_url=$(url_to_file_name "${url}")
-    ideal_name="${lower_layer}_${build_info_from_layer_build_template}"
-
-    list="${ideal_name}"
-
-    for f in $(find -L ${layer_dirs} ${mirror_dir} -type f -name "${name_from_url}"); do
-        cp $f ${build_info_file_dir}/${list}
-        if [ $? -ne 0 ]; then
-            echo "WARNING: Failed to copy from cached file '$f' to satisfy url '${url}'"
-        fi
-    done
-
-    if [ ! -f ${build_info_file_dir}/${list} ]; then
-        curl --silent --fail ${url} > ${build_info_file_dir}/${list}
-        if [ $? -ne 0 ]; then
-            echo "WARNING: Failed to download from url '${url}'"
-        fi
-    fi
-done
-
-
-#
-# Dowload lst files from layer_pkg_urls
-#
-for key in "${!layer_pkg_urls[@]}"; do
-    lower_layer="${key%,*}"
-    build_type="${key#*,}"
-    url="${layer_pkg_urls[${key}]}"
-    name_from_url=$(url_to_file_name "${url}")
-    ideal_name="${lower_layer}_${build_type}_${rpms_from_layer_build_template}"
-    list="${ideal_name}"
-
-    for f in $(find -L ${layer_dirs} ${mirror_dir} -type f -name "${name_from_url}"); do
-        cp $f ${lst_file_dir}/${list}
-        if [ $? -ne 0 ]; then
-            echo "WARNING: Failed to copy from cached file '$f' to satisfy url '${url}'"
-        fi
-    done
-
-    if [ ! -f ${lst_file_dir}/${list} ]; then
-        curl --silent --fail ${url} > ${lst_file_dir}/${list}
-        if [ $? -ne 0 ]; then
-            echo "ERROR: Failed to download from url '${url}'"
-            exit 1
-        fi
-    fi
-
-    if [ "${build_type}" == "rt" ]; then
-        rpm_lst_files_rt+=" ${list}"
-    else
-        rpm_lst_files+=" ${list}"
-    fi
-
-    url_type=${url%%:*}
-    if [ "${url_type}" == "file" ]; then
-        url_dir=$(dirname ${url#file://})
-        if [ ! -d ${url_dir} ]; then
-            echo "ERROR: No such directory '${url_dir}' derived from url: ${url}"
-            exit 1
-        fi
-        layer_dirs+=" ${url_dir}"
-    fi
-done
-
-echo "rpm_lst_files=${rpm_lst_files}"
-echo "rpm_lst_files_rt=${rpm_lst_files_rt}"
-echo "layer_dirs=${layer_dirs}"
-
-mirror_content=$(mktemp -t centos-repo-XXXXXX)
-find -L ${layer_dirs} ${mirror_dir} -type f -name '*.rpm' > ${mirror_content}
-
-sed_expression=""
-for d in ${mirror_dir} ${layer_dirs}; do
-    sed_expression+=" -e s%^${d}/%%"
-done
-
-
-process_lst_file () {
-    local lst_file="${1}"
-    local dest_dir="${2}"
-
-    grep -v "^#" ${lst_file_dir}/${lst_file} | while IFS="#" read rpmname extrafields; do
-        if [ -z "${rpmname}" ]; then
-            continue
-        fi
-
-        mirror_file=$(grep "/${rpmname}$" ${mirror_content} | head -n 1)
-        if [ -z "${mirror_file}" ]; then
-            echo "Error -- could not find requested ${rpmname} in ${mirror_dir}"
-            echo ${rpmname} >> ${missing_rpms_file}
-            continue
-        fi
-
-        # Great, we found the file!  Let's strip the mirror_dir prefix from it...
-        ff=$(echo ${mirror_file} | sed ${sed_expression})
-        f_name=$(basename "$ff")
-        arch=$(echo ${f_name} | rev | cut -d '.' -f 2 | rev)
-        if [ "${arch}" == "src" ]; then
-            sub_dir="Source"
-        else
-            sub_dir="Binary/${arch}"
-        fi
-
-        # Make sure we have a subdir (so we don't symlink the first file as
-        # the subdir name)
-        mkdir -p ${dest_dir}/${sub_dir}
-
-        # Link it!
-        echo "Creating symlink for ${dest_dir}/${sub_dir}/${f_name}"
-        ln -sf "${mirror_file}" "${dest_dir}/${sub_dir}/${f_name}"
-        if [ $? -ne 0 ]; then
-            echo "Failed ${mirror_file}: ln -sf \"${mirror_file}\" \"${dest_dir}/${sub_dir}\""
-        fi
-    done
-}
-
-for lst_file in ${rpm_lst_files} ; do
-    process_lst_file "${lst_file}" "${dest_dir}" || exit 1
-done
-
-for lst_file in ${rpm_lst_files_rt} ; do
-    process_lst_file "${lst_file}" "${dest_dir}/rt" || exit 1
-done
-
-
-echo "Copying comps.xml file."
-
-if [ ! -f "$comps_xml_file" ]; then
-    echo "Cannot find comps.xml file!"
-    exit 1
-fi
-
-if [ -f "$comps_xml_dest_file" ]; then
-    \cp -f "$comps_xml_dest_file" "$comps_xml_dest_file-backup-$timestamp"
-fi
-cp "$comps_xml_file" "$comps_xml_dest_file"
-
-
-echo "Createing yum repodata."
-
-for subdir in Source Binary; do
-    repo_dir="${dest_dir}/${subdir}"
-    mkdir -p "${repo_dir}"
-    if [ -f "${repo_dir}/comps.xml" ]; then
-        ${CREATEREPO} -g "${repo_dir}/comps.xml" -d "${repo_dir}"
-    else
-        ${CREATEREPO} -d "${repo_dir}"
-    fi
-
-    repo_dir="${dest_dir}/rt/${subdir}"
-    mkdir -p "${repo_dir}"
-    if [ -f "${repo_dir}/comps.xml" ]; then
-        ${CREATEREPO} -g "${repo_dir}/comps.xml" -d "${repo_dir}"
-    else
-        ${CREATEREPO} -d "${repo_dir}"
-    fi
-done
-
-
-echo "Copying mock.cfg.proto file."
-
-if [ ! -f "$mock_cfg_file" ]; then
-    echo "Cannot find mock.cfg.proto file!"
-    exit 1
-fi
-
-if [ -f "$mock_cfg_dest_file" ]; then
-    \cp -f "$mock_cfg_dest_file" "$mock_cfg_dest_file-backup-$timestamp"
-fi
-cp "$mock_cfg_file" "$mock_cfg_dest_file"
-
-
-# Populate the contents from other list files
-cat ${lst_file_dir}/${other_lst_file} | grep -v "#" | while IFS=":" read targettype item extrafields; do
-    if [ "${targettype}" == "folder" ]; then
-        echo "Creating folder ${item}"
-        mkdir -p $MY_REPO/cgcs-centos-repo/Binary/${item}
-    fi
-
-    if [ "${targettype}" == "file" ]; then
-        mkdir -p $MY_REPO/cgcs-centos-repo/Binary/$(dirname ${item})
-        echo "Creating symlink for $MY_REPO/cgcs-centos-repo/Binary/${item}"
-        ln -sf ${mirror_dir}/Binary/${item} $MY_REPO/cgcs-centos-repo/Binary/${item}
-    fi
-done
-
-echo "Done creating repo directory"
-declare -i missing_rpms_file_count=$(wc -l ${missing_rpms_file} 2>/dev/null | awk '{print $1}')
-if [ ${missing_rpms_file_count} -gt 0 ]; then
-    echo "WARNING: Some targets could not be found.  Your repo may be incomplete."
-    echo "Missing targets:"
-    cat ${missing_rpms_file}
-    exit 1
-fi
+echo "" 1>&2
+echo "generate-cgcs-centos-repo.sh is deprecated. Please use generate-centos-repo.sh instead." 1>&2
+echo "" 1>&2
+echo "Forwarding to generate-centos-repo.sh in 5 seconds" 1>&2
+echo "" 1>&2
+sleep 5
+
+${GENERATE_CGCS_CENTOS_REPO_DIR}/generate-centos-repo.sh "$@"
diff --git a/toCOPY/generate-cgcs-tis-repo b/toCOPY/generate-cgcs-tis-repo
index 39520ea3..060412a4 100755
--- a/toCOPY/generate-cgcs-tis-repo
+++ b/toCOPY/generate-cgcs-tis-repo
@@ -2,153 +2,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright (C) 2019 Intel Corporation
+# Copyright (c) 2020 Wind River Systems, Inc.
 #
 
-set -e
-export SRC_BUILD_ENVIRONMENT="stx-r1"
-export ARCH="x86_64"
-export PATH="${MY_REPO}/build-tools:${PATH}"
+# This file included for backward compatibility, and
+# should be removed after a reasonable time.
 
-EXPORTS="$MY_WORKSPACE/export/mirrors/"
-DISTRO="CentOS"
-HEAD_FILE="${MY_REPO_ROOT_DIR}/.repo/projects/cgcs-root.git/HEAD"
-STAT="$(stat -c %Y ${HEAD_FILE})"
-TIMESTAMP=$(date -d @$(stat -c %Y ${HEAD_FILE}) +%Y-%m-%dT%H:%M:%S)
-STD_PKG_DIR="${MY_WORKSPACE}/std/rpmbuild/RPMS"
-RT_PKG_DIR="${MY_WORKSPACE}/rt/rpmbuild/RPMS"
-RELEASE="$SRC_BUILD_ENVIRONMENT"
-CACHE_DIR="$EXPORTS/$DISTRO/$RELEASE"
-DEST_RPM_ROOT="${CACHE_DIR}/${ARCH}"
-DEST_SRPM_ROOT="${CACHE_DIR}/Source"
-DEST_RPM_ROOT_NEW="${DEST_RPM_ROOT}.new"
-DEST_SRPM_ROOT_NEW="${DEST_SRPM_ROOT}.new"
-DEST_RPM_ROOT_OLD="${DEST_RPM_ROOT}.old"
-DEST_SRPM_ROOT_OLD="${DEST_SRPM_ROOT}.old"
-DEST_RPM="${DEST_RPM_ROOT_NEW}/Packages"
-DEST_SRPM="${DEST_SRPM_ROOT_NEW}/SPackages"
-DEST_RPM_REPODATA="${DEST_RPM_ROOT_NEW}/repodata"
-DEST_SRPM_REPODATA="${DEST_SRPM_ROOT_NEW}/repodata"
-TIS_REPO_DIR="${MY_REPO}/cgcs-tis-repo"
-TIS_CACHE_DIR="${TIS_REPO_DIR}/dependancy-cache"
-TIS_CACHE_ORIGIN="${TIS_REPO_DIR}/origin"
-ORIGIN="/import/mirrors/CentOS/${SRC_BUILD_ENVIRONMENT}/CentOS/pike"
 
-CREATEREPO=$(which createrepo_c)
-if [ $? -ne 0 ]; then
-   CREATEREPO="createrepo"
-fi
+GENERATE_CGCS_TIS_REPO_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}" )" )"
 
-# Create directories
-for d in "$DEST_RPM" "$DEST_SRPM" "$TIS_CACHE_DIR"; do
-	if [ ! -d "$d" ]; then
-		mkdir -p "$d"
-	fi
-done
+echo "" 1>&2
+echo "generate-cgcs-tis-repo is deprecated. Please use generate-local-repo.sh instead." 1>&2 
+echo "" 1>&2
+echo "Forwarding to generate-local-repo.sh in 5 seconds" 1>&2
+echo "" 1>&2
+sleep 5
 
-if [ ! -e "$TIS_CACHE_ORIGIN" ]; then
-	echo "$ORIGIN" > $TIS_CACHE_ORIGIN
-	ORIGIN_DIR="$ORIGIN"
-else
-	ORIGIN_DIR=$(grep -v '^#'  $TIS_CACHE_ORIGIN | head -n 1)
-fi
-
-if [ ! -d "$ORIGIN_DIR" ]; then
-	echo "ERROR: directory not found '$ORIGIN_DIR'"
-	exit -1
-fi
-
-# copy standard and rt build of binary packages
-for f in $(find "$RT_PKG_DIR" "$STD_PKG_DIR" -name '*.rpm' \
-	| grep -v '[.]src[.]rpm'); do
-	ff="$(basename $f)"
-	echo "$ff"
-	cp "$f" "$DEST_RPM"
-	touch "${DEST_RPM}/${ff}" --date="$TIMESTAMP"
-done
-
-# Make a repo out of it
-( cd "$DEST_RPM_ROOT_NEW"; $CREATEREPO $PWD; exit $? )
-
-# copy standard and rt build of src.rpm packages
-for f in $(find "$STD_PKG_DIR" "$RT_PKG_DIR" -name '*.src.rpm'); do
-	ff="$(basename $f)"
-	echo "$ff"
-	cp "$f" "$DEST_SRPM"
-	touch "${DEST_SRPM}/${ff}" --date="$TIMESTAMP"
-done
-
-# Make a repo out of it
-( cd  "$DEST_SRPM_ROOT_NEW"; $CREATEREPO $PWD; exit $? )
-
-date > "${DEST_SRPM_ROOT_NEW}/last_updated"
-date > "${DEST_RPM_ROOT_NEW}/last_updated"
-
-# Rotate directories ... current becomes old, and new becomes current
-if [ -d $DEST_RPM_ROOT ]; then
-	mv "$DEST_RPM_ROOT" "$DEST_RPM_ROOT_OLD"
-fi
-
-mv "$DEST_RPM_ROOT_NEW" "$DEST_RPM_ROOT"
-rm -rf "$DEST_RPM_ROOT_OLD"
-
-if [ -d "$DEST_SRPM_ROOT" ]; then
-	mv "$DEST_SRPM_ROOT" "$DEST_SRPM_ROOT_OLD"
-fi
-
-mv "$DEST_SRPM_ROOT_NEW" "$DEST_SRPM_ROOT"
-rm -rf "$DEST_SRPM_ROOT_OLD"
-
-# Update symlinks in cgcs-tis-repo
-
-for d in $(find "$ORIGIN_DIR" -type d | tail -n +2); do
-	RELATIVE_DIR=$(echo $d | sed "s#^$ORIGIN_DIR/##")
-	if [ -d "${TIS_REPO_DIR}/${RELATIVE_DIR}" ]; then
-		rm -rf "${TIS_REPO_DIR}/${RELATIVE_DIR}/*"
-	fi
-	echo "mkdir -p $RELATIVE_DIR"
-	mkdir -p "${TIS_REPO_DIR}/${RELATIVE_DIR}"
-done
-
-for d in $(find "$ORIGIN_DIR" -type d | tail -n +2); do
-	for f in $(find $d -maxdepth 1 -type f); do
-		RELATIVE_FILE=$(echo $f | sed "s#^$ORIGIN_DIR/##")
-		if [ -e "${TIS_REPO_DIR}/${RELATIVE_FILE}" ]; then
-			rm -f "${TIS_REPO_DIR}/${RELATIVE_FILE}"
-		fi
-		ln -s "$f" "${TIS_REPO_DIR}/${RELATIVE_FILE}"
-	done
-done
-
-for d in $(find -L "$TIS_REPO_DIR" -type d -name repodata); do
-	pushd  "${d}/.."
-	rm -rf repodata
-	if [ -f "comps.xml" ]; then
-		"$CREATEREPO" -g comps.xml "$PWD"
-	else
-		"$CREATEREPO" "$PWD"
-	fi
-	popd
-done
-
-# Recreate repodata
-cd "$TIS_REPO_DIR"
-
-for d in $(find -L . -type d -name repodata); do
-	pushd "${d}/.."
-	for c in $(ls -1 repodata/*comps*xml); do
-		mv -f "${c}" comps.xml
-	done
-	if [ -d "repodata" ]; then
-		rm -rf repodata
-	fi
-	if [ -f "comps.xml" ]; then
-		$CREATEREPO -g comps.xml "$PWD"
-	else
-		$CREATEREPO "$PWD"
-	fi
-	popd
-done
-
-# Update the dependancy_cache under cgcs-tis-repo
-create_dependancy_cache.py --cache_dir "${TIS_CACHE_DIR}"
+${GENERATE_CGCS_TIS_REPO_DIR}/generate-local-repo.sh "$@"
diff --git a/toCOPY/generate-local-repo.sh b/toCOPY/generate-local-repo.sh
new file mode 100755
index 00000000..4b782ae2
--- /dev/null
+++ b/toCOPY/generate-local-repo.sh
@@ -0,0 +1,154 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (C) 2019 Intel Corporation
+#
+
+set -e
+export SRC_BUILD_ENVIRONMENT="stx"
+export ARCH="x86_64"
+export PATH="${MY_REPO}/build-tools:${PATH}"
+
+EXPORTS="$MY_WORKSPACE/export/mirrors/"
+DISTRO="CentOS"
+HEAD_FILE="${MY_REPO_ROOT_DIR}/.repo/projects/cgcs-root.git/HEAD"
+STAT="$(stat -c %Y ${HEAD_FILE})"
+TIMESTAMP=$(date -d @$(stat -c %Y ${HEAD_FILE}) +%Y-%m-%dT%H:%M:%S)
+STD_PKG_DIR="${MY_WORKSPACE}/std/rpmbuild/RPMS"
+RT_PKG_DIR="${MY_WORKSPACE}/rt/rpmbuild/RPMS"
+RELEASE="$SRC_BUILD_ENVIRONMENT"
+CACHE_DIR="$EXPORTS/$DISTRO/$RELEASE"
+DEST_RPM_ROOT="${CACHE_DIR}/${ARCH}"
+DEST_SRPM_ROOT="${CACHE_DIR}/Source"
+DEST_RPM_ROOT_NEW="${DEST_RPM_ROOT}.new"
+DEST_SRPM_ROOT_NEW="${DEST_SRPM_ROOT}.new"
+DEST_RPM_ROOT_OLD="${DEST_RPM_ROOT}.old"
+DEST_SRPM_ROOT_OLD="${DEST_SRPM_ROOT}.old"
+DEST_RPM="${DEST_RPM_ROOT_NEW}/Packages"
+DEST_SRPM="${DEST_SRPM_ROOT_NEW}/SPackages"
+DEST_RPM_REPODATA="${DEST_RPM_ROOT_NEW}/repodata"
+DEST_SRPM_REPODATA="${DEST_SRPM_ROOT_NEW}/repodata"
+LOCAL_REPO_DIR="${MY_REPO}/local-repo"
+LOCAL_CACHE_DIR="${LOCAL_REPO_DIR}/dependancy-cache"
+LOCAL_CACHE_ORIGIN="${LOCAL_REPO_DIR}/origin"
+ORIGIN="/import/mirrors/CentOS/${SRC_BUILD_ENVIRONMENT}/CentOS"
+
+CREATEREPO=$(which createrepo_c)
+if [ $? -ne 0 ]; then
+    CREATEREPO="createrepo"
+fi
+
+# Create directories
+for d in "$DEST_RPM" "$DEST_SRPM" "$LOCAL_CACHE_DIR"; do
+    if [ ! -d "$d" ]; then
+        mkdir -p "$d"
+    fi
+done
+
+if [ ! -e "$LOCAL_CACHE_ORIGIN" ]; then
+    echo "$ORIGIN" > $LOCAL_CACHE_ORIGIN
+    ORIGIN_DIR="$ORIGIN"
+else
+    ORIGIN_DIR=$(grep -v '^#'  $LOCAL_CACHE_ORIGIN | head -n 1)
+fi
+
+if [ ! -d "$ORIGIN_DIR" ]; then
+    echo "ERROR: directory not found '$ORIGIN_DIR'"
+    exit -1
+fi
+
+# copy standard and rt build of binary packages
+for f in $(find "$RT_PKG_DIR" "$STD_PKG_DIR" -name '*.rpm' \
+    | grep -v '[.]src[.]rpm'); do
+    ff="$(basename $f)"
+    echo "$ff"
+    cp "$f" "$DEST_RPM"
+    touch "${DEST_RPM}/${ff}" --date="$TIMESTAMP"
+done
+
+# Make a repo out of it
+( cd "$DEST_RPM_ROOT_NEW"; $CREATEREPO $PWD; exit $? )
+
+# copy standard and rt build of src.rpm packages
+for f in $(find "$STD_PKG_DIR" "$RT_PKG_DIR" -name '*.src.rpm'); do
+    ff="$(basename $f)"
+    echo "$ff"
+    cp "$f" "$DEST_SRPM"
+    touch "${DEST_SRPM}/${ff}" --date="$TIMESTAMP"
+done
+
+# Make a repo out of it
+( cd  "$DEST_SRPM_ROOT_NEW"; $CREATEREPO $PWD; exit $? )
+
+date > "${DEST_SRPM_ROOT_NEW}/last_updated"
+date > "${DEST_RPM_ROOT_NEW}/last_updated"
+
+# Rotate directories ... current becomes old, and new becomes current
+if [ -d $DEST_RPM_ROOT ]; then
+    mv "$DEST_RPM_ROOT" "$DEST_RPM_ROOT_OLD"
+fi
+
+mv "$DEST_RPM_ROOT_NEW" "$DEST_RPM_ROOT"
+rm -rf "$DEST_RPM_ROOT_OLD"
+
+if [ -d "$DEST_SRPM_ROOT" ]; then
+    mv "$DEST_SRPM_ROOT" "$DEST_SRPM_ROOT_OLD"
+fi
+
+mv "$DEST_SRPM_ROOT_NEW" "$DEST_SRPM_ROOT"
+rm -rf "$DEST_SRPM_ROOT_OLD"
+
+# Update symlinks in local-repo
+
+for d in $(find "$ORIGIN_DIR" -type d | tail -n +2); do
+    RELATIVE_DIR=$(echo $d | sed "s#^$ORIGIN_DIR/##")
+    if [ -d "${LOCAL_REPO_DIR}/${RELATIVE_DIR}" ]; then
+        rm -rf "${LOCAL_REPO_DIR}/${RELATIVE_DIR}/*"
+    fi
+    echo "mkdir -p $RELATIVE_DIR"
+    mkdir -p "${LOCAL_REPO_DIR}/${RELATIVE_DIR}"
+done
+
+for d in $(find "$ORIGIN_DIR" -type d | tail -n +2); do
+    for f in $(find $d -maxdepth 1 -type f); do
+        RELATIVE_FILE=$(echo $f | sed "s#^$ORIGIN_DIR/##")
+        if [ -e "${LOCAL_REPO_DIR}/${RELATIVE_FILE}" ]; then
+            rm -f "${LOCAL_REPO_DIR}/${RELATIVE_FILE}"
+        fi
+        ln -s "$f" "${LOCAL_REPO_DIR}/${RELATIVE_FILE}"
+    done
+done
+
+for d in $(find -L "$LOCAL_REPO_DIR" -type d -name repodata); do
+    pushd  "${d}/.."
+    rm -rf repodata
+    if [ -f "comps.xml" ]; then
+        "$CREATEREPO" -g comps.xml "$PWD"
+    else
+        "$CREATEREPO" "$PWD"
+    fi
+    popd
+done
+
+# Recreate repodata
+cd "$LOCAL_REPO_DIR"
+
+for d in $(find -L . -type d -name repodata); do
+    pushd "${d}/.."
+    for c in $(ls -1 repodata/*comps*xml); do
+        mv -f "${c}" comps.xml
+    done
+    if [ -d "repodata" ]; then
+        rm -rf repodata
+    fi
+    if [ -f "comps.xml" ]; then
+        $CREATEREPO -g comps.xml "$PWD"
+    else
+        $CREATEREPO "$PWD"
+    fi
+    popd
+done
+
+# Update the dependancy_cache under local-repo
+create_dependancy_cache.py --cache_dir "${LOCAL_CACHE_DIR}"
diff --git a/toCOPY/yum.repos.d/centos.repo b/toCOPY/yum.repos.d/centos.repo
new file mode 100644
index 00000000..4aac865f
--- /dev/null
+++ b/toCOPY/yum.repos.d/centos.repo
@@ -0,0 +1,29 @@
+# centos_8_1_url must be defined in /etc/dnf/vars/
+
+[centos-appstream]
+name=centos-os
+baseurl=$centos_8_1_url/AppStream/$basearch/os/
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+[centos-extras]
+name=centos-extras
+baseurl=$centos_8_1_url/extras/$basearch/os/
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+[centos-powertools]
+name=centos-powertools
+baseurl=$centos_8_1_url/PowerTools/$basearch/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
+
+[centos-baseos]
+name=centos-baseos
+baseurl=$centos_8_1_url/BaseOS/$basearch/os/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled=1
diff --git a/toCOPY/yum.repos.d/epel.repo b/toCOPY/yum.repos.d/epel.repo
new file mode 100644
index 00000000..b8d3d518
--- /dev/null
+++ b/toCOPY/yum.repos.d/epel.repo
@@ -0,0 +1,10 @@
+# epel_8_1_url must be defined in /etc/dnf/vars/
+
+[epel]
+name=epel
+baseurl=$epel_8_1_url/$basearch/
+failovermethod=priority
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
+