diff --git a/build-setup.sh b/build-setup.sh
index 5d80957..cf339d4 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -278,8 +278,8 @@
 # Kick off a build
 bitbake ${BITBAKE_OPTS} obmc-phosphor-image
 
-# Copy images out of internal obmcdir into workspace directory
-cp -R ${obmcdir}/build/tmp/deploy ${WORKSPACE}/deploy/
+# Copy build directory of internal obmcdir into workspace directory
+cp -a ${obmcdir}/build/. ${WORKSPACE}/build/
 
 EOF_SCRIPT
 
@@ -326,5 +326,8 @@
   echo "Launch Parameter is invalid"
 fi
 
+# To maintain function of resources that used an older path, add a link
+ln -sf ${WORKSPACE}/build/tmp/deploy ${WORKSPACE}/deploy
+
 # Timestamp for build
 echo "Build completed, $(date)"