diff --git a/build/buildEnvironment.sh b/build/buildEnvironment.sh
index 4e8c76e16b..05b8890bf9 100755
--- a/build/buildEnvironment.sh
+++ b/build/buildEnvironment.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Version
 export AWIPSII_VERSION="17.1.1"
-export AWIPSII_RELEASE="4"
+export AWIPSII_RELEASE="5"
 # Author
 export AWIPSII_BUILD_VENDOR="UCAR"
 export AWIPSII_BUILD_SITE="Unidata"
diff --git a/build/build_rpms.sh b/build/build_rpms.sh
index 88cdb97f9f..08de80407e 100755
--- a/build/build_rpms.sh
+++ b/build/build_rpms.sh
@@ -13,6 +13,7 @@ pushd $REPO
 
 # if not mounted to docker container, clone from github
 if [ ! -d awips2-ncep ]; then		git clone https://github.com/Unidata/awips2-ncep.git --branch unidata_${AWIPSII_VERSION} --single-branch 	;fi
+if [ ! -d awips2-goesr ]; then		git clone https://github.com/Unidata/awips2-goesr.git --branch unidata_${AWIPSII_VERSION} --single-branch 	;fi
 if [ ! -d awips2-core ]; then		git clone https://github.com/Unidata/awips2-core.git --branch unidata_${AWIPSII_VERSION} --single-branch 	;fi
 if [ ! -d awips2-core-foss ]; then	git clone https://github.com/Unidata/awips2-core-foss.git --branch unidata_${AWIPSII_VERSION} --single-branch 	;fi
 if [ ! -d awips2-foss ]; then		git clone https://github.com/Unidata/awips2-foss.git --branch unidata_${AWIPSII_VERSION} --single-branch 	;fi
@@ -35,13 +36,13 @@ if [ ! -z "$prog" ]; then
   su - awips -c "/bin/bash $buildsh -b $prog"
 else
   # Build all groups (in this order)
-  #su - awips -c "/bin/bash $buildsh -ade"
-  #su - awips -c "/bin/bash $buildsh -python"
-  #su - awips -c "/bin/bash $buildsh -qpid"
-  #su - awips -c "/bin/bash $buildsh -server"
+  su - awips -c "/bin/bash $buildsh -ade"
+  su - awips -c "/bin/bash $buildsh -python"
+  su - awips -c "/bin/bash $buildsh -qpid"
+  su - awips -c "/bin/bash $buildsh -server"
   su - awips -c "/bin/bash $buildsh -edex"
-  #su - awips -c "/bin/bash $buildsh -database"
-  #su - awips -c "/bin/bash $buildsh -cave"
+  su - awips -c "/bin/bash $buildsh -database"
+  su - awips -c "/bin/bash $buildsh -cave"
 fi
 
 # Manage RPMs
diff --git a/build/rsync.dirs b/build/rsync.dirs
index 11b4734976..6e9b0ff4a1 100644
--- a/build/rsync.dirs
+++ b/build/rsync.dirs
@@ -17,3 +17,5 @@ javaUtilities/* rpms pythonPackages nativeLib/*
 ../awips2-ncep/viz/* 
 ../awips2-ncep/features/* 
 ../awips2-ncep/edex/* 
+../awips2-goesr/edexOsgi/* 
+../awips2-goesr/cave/* 
diff --git a/build/setup.sh b/build/setup.sh
index 8bf6447cdd..10dbde76fc 100755
--- a/build/setup.sh
+++ b/build/setup.sh
@@ -14,8 +14,9 @@ if [ -d /awips2/repo/awips2-core-foss ]; then	corefoss_dir=" -v /awips2/repo/awi
 if [ -d /awips2/repo/awips2-foss ]; then	foss_dir="     -v /awips2/repo/awips2-foss:/awips2/repo/awips2-foss "		;fi
 if [ -d /awips2/repo/awips2-nws ]; then		nws_dir="      -v /awips2/repo/awips2-nws:/awips2/repo/awips2-nws "		;fi
 if [ -d /awips2/repo/awips2-ncep ]; then	ncep_dir="     -v /awips2/repo/awips2-ncep:/awips2/repo/awips2-ncep "		;fi
+if [ -d /awips2/repo/awips2-goesr ]; then	goesr_dir="    -v /awips2/repo/awips2-goesr:/awips2/repo/awips2-goesr "		;fi
 if [ -d /awips2/repo/python-awips ]; then	python_dir="   -v /awips2/repo/python-awips:/awips2/repo/python-awips "		;fi
-dirs=$builds_dir$static_dir$rpm_dir$core_dir$corefoss_dir$foss_dir$nws_dir$ncep_dir$python_dir
+dirs=$builds_dir$static_dir$rpm_dir$core_dir$corefoss_dir$foss_dir$nws_dir$ncep_dir$goesr_dir$python_dir
 
 # run
 sudo docker run --entrypoint=/bin/bash --privileged -d -ti -e "container=docker" $dirs unidata/awips-ade:17.1.1-$os_version