diff --git a/configBuilder.sh b/configBuilder.sh
index a30b338..65152eb 100644
--- a/configBuilder.sh
+++ b/configBuilder.sh
@@ -72,10 +72,14 @@ case "$BUILD_ENV" in
 LINUX | linux)
     echo "Getting build files for a Linux container"
     wget -q -O ${TMP_DIR_D}.zip ${LINUX_BUILD_FILES_URL}  > /dev/null
+    unzip -o -d ${TMP_DIR_D} ${TMP_DIR_D}.zip > /dev/null 2>&1
+    cp -rf ${TMP_DIR_D}/shib-idp_noVM-master/* /output
     ;;
 WINDOWS | windows)
     echo "Getting build files for a Windows container"
     wget -q -O ${TMP_DIR_D}.zip ${WINDOWS_BUILD_FILES_URL}  > /dev/null
+    unzip -o -d ${TMP_DIR_D} ${TMP_DIR_D}.zip > /dev/null 2>&1
+    cp -rf ${TMP_DIR_D}/ShibbIdP_noVM_Windows-master/* /output
     ;;
 *)
     echo "Environment variable BUILD_ENV was not found or had an incorrect value (only LINUX|WINDOWS is supported).  Terminating."
@@ -83,20 +87,15 @@ WINDOWS | windows)
     ;;
 esac
 
-unzip -o -d ${TMP_DIR_D} ${TMP_DIR_D}.zip > /dev/null 2>&1
-
-cp -rf ${TMP_DIR_D}/shib-idp_noVM-master/* /output
 rm -f /output/configBuilder.sh > /dev/null 2>&1
 rm -f /output/setup.log > /dev/null 2>&1
 rm -f /output/README.md > /dev/null 2>&1
 rm -rf /output/shib-idp_noVM-master/*
 
-
 #grab copy of Dockerfile in working dir
 cp -f /output/Dockerfile .
 
 
-
 ##############################################################
 ### download default/TIER config for both shibb and tomcat ###
 ##############################################################