diff --git a/api/build.sh b/api/build.sh
index 2b7f06e5e..56556c026 100644
--- a/api/build.sh
+++ b/api/build.sh
@@ -18,6 +18,8 @@ check_prereq() {
 }
 
 function build_api(){
+    cp -R ../api ../_api
+    cd ../_api
     cp -R ../utilities/utils ../sourcemap-reader/.
     cp -R ../sourcemap-reader .
     tag=""
@@ -28,6 +30,8 @@ function build_api(){
         tag="ee-"
     }
     docker build -f ./Dockerfile --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/chalice:${git_sha1} .
+    cd ../api
+    rm -rf ../_api
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/chalice:${git_sha1}
         docker tag ${DOCKER_REPO:-'local'}/chalice:${git_sha1} ${DOCKER_REPO:-'local'}/chalice:${tag}latest
@@ -39,9 +43,8 @@ function build_api(){
 check_prereq
 build_api $1
 echo buil_complete
-source build_alerts.sh $1
+IMAGE_TAG=$IMAGE_TAG PUSH_IMAGE=$PUSH_IMAGE DOCKER_REPO=$DOCKER_REPO bash build_alerts.sh $1
 
 [[ $1 == "ee" ]] && {
   IMAGE_TAG=$IMAGE_TAG PUSH_IMAGE=$PUSH_IMAGE DOCKER_REPO=$DOCKER_REPO bash build_crons.sh $1
-}
-echo "api done"
+}
\ No newline at end of file
diff --git a/api/build_alerts.sh b/api/build_alerts.sh
index b5aa759b0..9ab21e6af 100644
--- a/api/build_alerts.sh
+++ b/api/build_alerts.sh
@@ -17,6 +17,8 @@ check_prereq() {
 }
 
 function build_api(){
+    cp -R ../api ../_alerts
+    cd ../_alerts
     tag=""
     # Copy enterprise code
     [[ $1 == "ee" ]] && {
@@ -24,15 +26,15 @@ function build_api(){
         envarg="default-ee"
         tag="ee-"
     }
-    cp -R ../api ../_alerts
-    docker build -f ../_alerts/Dockerfile.alerts --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/alerts:${git_sha1} .
+    docker build -f ./Dockerfile.alerts --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/alerts:${git_sha1} .
+    cd ../api
     rm -rf ../_alerts
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/alerts:${git_sha1}
         docker tag ${DOCKER_REPO:-'local'}/alerts:${git_sha1} ${DOCKER_REPO:-'local'}/alerts:${tag}latest
         docker push ${DOCKER_REPO:-'local'}/alerts:${tag}latest
     }
-echo "completed alerts build"
+    echo "completed alerts build"
 }
 
 check_prereq
diff --git a/ee/api/build_crons.sh b/ee/api/build_crons.sh
index 32bc7ec7f..0a6929583 100644
--- a/ee/api/build_crons.sh
+++ b/ee/api/build_crons.sh
@@ -18,6 +18,8 @@ check_prereq() {
 }
 
 function build_api(){
+    cp -R ../api ../_crons
+    cd ../_crons
     tag=""
     # Copy enterprise code
 
@@ -25,15 +27,15 @@ function build_api(){
     envarg="default-ee"
     tag="ee-"
 
-    cp -R ../api ../_crons
-    docker build -f ../_crons/Dockerfile.crons --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/crons:${git_sha1} .
+    docker build -f ./Dockerfile.crons --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/crons:${git_sha1} .
+    cd ../api
     rm -rf ../crons
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/crons:${git_sha1}
         docker tag ${DOCKER_REPO:-'local'}/crons:${git_sha1} ${DOCKER_REPO:-'local'}/crons:${tag}latest
         docker push ${DOCKER_REPO:-'local'}/crons:${tag}latest
     }
-echo "completed crons build"
+    echo "completed crons build"
 }
 
 check_prereq