diff --git a/README.rst b/README.rst
index 330b4d41..7c9bf53f 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/LiveOS/squashfs.img
-        - out/stx-r1/CentOS/pike/Binary/images/pxeboot/initrd.img
-        - out/stx-r1/CentOS/pike/Binary/images/pxeboot/vmlinuz
+        - out/stx/CentOS/Binary/LiveOS/squashfs.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.
@@ -302,7 +302,7 @@ 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-cgcs-centos-repo.sh /import/mirrors/CentOS
 
 Where the argument to the script is the path of the mirror.
 
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/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 d3674191..0761ce4e 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 59103477..6a0d7057 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 35aebe11..d76714d7 100755
--- a/centos-mirror-tools/dl_tarball.sh
+++ b/centos-mirror-tools/dl_tarball.sh
@@ -112,7 +112,7 @@ fi
 # to be populated under $MY_REPO/addons/wr-cgcs/layers/cgcs/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"
diff --git a/centos-mirror-tools/download_mirror.sh b/centos-mirror-tools/download_mirror.sh
index 8fc2cbcb..54a7f834 100755
--- a/centos-mirror-tools/download_mirror.sh
+++ b/centos-mirror-tools/download_mirror.sh
@@ -8,7 +8,17 @@ 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 $old_dir && ! -d $DL_MIRROR_OUTPUT_DIR ]; then
+    mkdir -p $(dirname $DL_MIRROR_OUTPUT_DIR)
+    mv $pike_dir $DL_MIRROR_OUTPUT_DIR
+fi
 
 usage() {
     echo "$0 [options]"
diff --git a/toCOPY/generate-cgcs-tis-repo b/toCOPY/generate-cgcs-tis-repo
index 1cb6473f..f70d7ebe 100755
--- a/toCOPY/generate-cgcs-tis-repo
+++ b/toCOPY/generate-cgcs-tis-repo
@@ -6,7 +6,7 @@
 #
 
 set -e
-export SRC_BUILD_ENVIRONMENT="stx-r1"
+export SRC_BUILD_ENVIRONMENT="stx"
 export ARCH="x86_64"
 export PATH="${MY_REPO}/build-tools:${PATH}"
 
@@ -32,7 +32,7 @@ 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"
+ORIGIN="/import/mirrors/CentOS/${SRC_BUILD_ENVIRONMENT}/CentOS"
 
 CREATEREPO=$(which createrepo_c)
 if [ $? -ne 0 ]; then