diff --git a/build/build_rhel.sh b/build/build_rhel.sh
index 69b177b634..998085ceba 100755
--- a/build/build_rhel.sh
+++ b/build/build_rhel.sh
@@ -1,7 +1,6 @@
 #!/bin/sh -xe
 OS_TYPE=$1
 OS_VERSION=$2
-
 if [ $OS_VERSION == "centos7" ]; then
     REPO_EXT="-el7" 
 fi
@@ -16,8 +15,7 @@ yum -y clean all
 yum groupinstall awips2-ade -y
 
 su - awips
-
-. /awips2/repo/awips2-builds/rpms/unidata/buildEnvironment.sh
+. /awips2/repo/awips2-src/rpms/unidata/buildEnvironment.sh
 
 mkdir -p /awips2/jenkins/buildspace/workspace/AWIPS2-UPC_build/baseline
 mkdir -p /awips2/jenkins/buildspace/workspace/tmp
@@ -25,6 +23,7 @@ mkdir -p /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/{x86_64,noarch}/
 
 pushd /awips2/repo
 
+git clone https://github.com/Unidata/awips2.git --branch unidata_${AWIPSII_VERSION}${REPO_EXT} --single-branch awips2-builds
 git clone https://github.com/Unidata/awips2-ncep.git --branch unidata_${AWIPSII_VERSION} --single-branch 
 git clone https://github.com/Unidata/awips2-core.git --branch unidata_${AWIPSII_VERSION} --single-branch
 git clone https://github.com/Unidata/awips2-core-foss.git --branch unidata_${AWIPSII_VERSION} --single-branch
@@ -43,4 +42,4 @@ cd /awips2/repo/awips2-builds/rpms/unidata/
 /bin/bash cibuild.sh -b buildEDEX >& /dev/null
 /bin/bash cibuild.sh -b buildCAVE >& /dev/null
 
-tar -cf /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/ /awips2/repo/awips2-builds/dist/awips2_${AWIPSII_VERSION}_${OS_TYPE}-${OS_VERSION}.tar
+tar -cf /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/ /awips2/repo/awips2-src/dist/awips2_${AWIPSII_VERSION}_${OS_TYPE}-${OS_VERSION}.tar
diff --git a/build/setup.sh b/build/setup.sh
index b9d3595e32..af25434183 100755
--- a/build/setup.sh
+++ b/build/setup.sh
@@ -3,15 +3,17 @@ os_type=$1
 os_version=$2
 
 if [ "$os_version" = "centos6" ]; then
-    sudo docker run --rm=true -v `pwd`:/awips2/repo/awips2-builds:rw ${os_type}:${os_version} /bin/bash -c "bash -xe /awips2/repo/awips2-builds/build/build_rhel.sh ${os_type} ${os_version}"
+
+    sudo docker run --rm=true -v `pwd`:/awips2/repo/awips2-src:rw ${os_type}:${os_version} /bin/bash -c "bash -xe /awips2/repo/awips2-src/build/build_rhel.sh ${os_type} ${os_version}"
+
 elif [ "$os_version" = "centos7" ]; then
-    sudo docker run --privileged -d -ti -e "container=docker" -v `pwd`:/awips2/repo/awips2-builds:rw  ${os_type}:${os_version}   /usr/sbin/init
+
+    sudo docker run --privileged -d -ti -e "container=docker" -v `pwd`:/awips2/repo/awips2-src:rw  ${os_type}:${os_version} /usr/sbin/init
     DOCKER_CONTAINER_ID=$(sudo docker ps | grep ${os_version} | awk '{print $1}' | head -1 )
     sudo docker logs $DOCKER_CONTAINER_ID
-    sudo docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "bash -xe /awips2/repo/awips2-builds/build/build_rhel.sh ${os_type} ${os_version}";
+    sudo docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "bash -xe /awips2/repo/awips2-src/build/build_rhel.sh ${os_type} ${os_version}";
     sudo docker ps -a
     sudo docker stop $DOCKER_CONTAINER_ID
     sudo docker rm -v $DOCKER_CONTAINER_ID
-elif [ "$os_type" = "fedora" ]; then
-    sudo docker run --rm=true -v `pwd`:/awips2/repo/awips2-builds:rw ${os_type}:${os_version} /bin/bash -c "bash -xe /awips2/repo/awips2-builds/build/build_rhel.sh ${os_type} ${os_version}"
+
 fi