diff --git a/api/build.sh b/api/build.sh
index afda47f13..a66a734d0 100644
--- a/api/build.sh
+++ b/api/build.sh
@@ -30,7 +30,7 @@ check_prereq() {
 [[ $1 == ee ]] && ee=true
 [[ $PATCH -eq 1 ]] && {
   image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}'  | awk -F. -v OFS=. '{$NF += 1 ; print}')"
-  [[ $ee == "true" ]] && { 
+  [[ $ee == "true" ]] && {
     image_tag="${image_tag}-ee"
   }
 }
@@ -78,12 +78,6 @@ function build_api(){
 check_prereq
 build_api $environment
 echo buil_complete
-[[ $PATCH -eq 1 ]] && update_helm_release chalice
-IMAGE_TAG=$IMAGE_TAG PUSH_IMAGE=$PUSH_IMAGE DOCKER_REPO=$DOCKER_REPO SIGN_IMAGE=$SIGN_IMAGE SIGN_KEY=$SIGN_KEY bash build_alerts.sh $1
-
-[[ $environment == "ee" ]] && {
-  cp ../ee/api/build_crons.sh .
-  IMAGE_TAG=$IMAGE_TAG PUSH_IMAGE=$PUSH_IMAGE DOCKER_REPO=$DOCKER_REPO SIGN_IMAGE=$SIGN_IMAGE SIGN_KEY=$SIGN_KEY bash build_crons.sh $1
-  exit_err $?
-  rm build_crons.sh
-} || true
+if [[ $PATCH -eq 1 ]]; then
+  update_helm_release chalice
+fi
\ No newline at end of file
diff --git a/api/build_alerts.sh b/api/build_alerts.sh
index 5047780fe..f8b1929c6 100644
--- a/api/build_alerts.sh
+++ b/api/build_alerts.sh
@@ -8,7 +8,7 @@
 # Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh <ee>
 
 git_sha=$(git rev-parse --short HEAD)
-image_tag=${IMAGE_TAG:-$git_sha}
+image_tag=${IMAGE_TAG:-git_sha}
 envarg="default-foss"
 check_prereq() {
     which docker || {
@@ -21,7 +21,7 @@ check_prereq() {
 [[ $1 == ee ]] && ee=true
 [[ $PATCH -eq 1 ]] && {
   image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}'  | awk -F. -v OFS=. '{$NF += 1 ; print}')"
-  [[ $ee == "true" ]] && { 
+  [[ $ee == "true" ]] && {
     image_tag="${image_tag}-ee"
   }
 }
@@ -68,4 +68,6 @@ function build_alerts(){
 
 check_prereq
 build_alerts $1
-[[ $PATCH -eq 1 ]] && update_helm_release alerts
+if [[ $PATCH -eq 1 ]]; then
+  update_helm_release alerts
+fi
diff --git a/assist/build.sh b/assist/build.sh
index 84c6f882c..3f98bcf36 100644
--- a/assist/build.sh
+++ b/assist/build.sh
@@ -18,7 +18,7 @@ check_prereq() {
 [[ $1 == ee ]] && ee=true
 [[ $PATCH -eq 1 ]] && {
   image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}'  | awk -F. -v OFS=. '{$NF += 1 ; print}')"
-  [[ $ee == "true" ]] && { 
+  [[ $ee == "true" ]] && {
     image_tag="${image_tag}-ee"
   }
 }
@@ -63,4 +63,6 @@ function build_api(){
 
 check_prereq
 build_api $1
-[[ $PATCH -eq 1 ]] && update_helm_release assist
+if [[ $PATCH -eq 1 ]]; then
+  update_helm_release assist
+fi
\ No newline at end of file
diff --git a/peers/build.sh b/peers/build.sh
index 7109004b6..51ea3f734 100644
--- a/peers/build.sh
+++ b/peers/build.sh
@@ -18,7 +18,7 @@ check_prereq() {
 [[ $1 == ee ]] && ee=true
 [[ $PATCH -eq 1 ]] && {
   image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}'  | awk -F. -v OFS=. '{$NF += 1 ; print}')"
-  [[ $ee == "true" ]] && { 
+  [[ $ee == "true" ]] && {
     image_tag="${image_tag}-ee"
   }
 }
@@ -63,5 +63,5 @@ function build_api(){
 check_prereq
 build_api $1
 if [[ $PATCH -eq 1 ]]; then
-  update_helm_release peers 
+  update_helm_release peers
 fi
diff --git a/sourcemap-reader/build.sh b/sourcemap-reader/build.sh
index 389a61a71..9181bff6b 100644
--- a/sourcemap-reader/build.sh
+++ b/sourcemap-reader/build.sh
@@ -11,7 +11,7 @@ set -e
 image_name="sourcemaps-reader"
 
 git_sha=$(git rev-parse --short HEAD)
-image_tag=${IMAGE_TAG:-$git_sha}
+image_tag=${IMAGE_TAG:-git_sha}
 envarg="default-foss"
 
 check_prereq() {
@@ -25,7 +25,7 @@ check_prereq() {
 [[ $1 == ee ]] && ee=true
 [[ $PATCH -eq 1 ]] && {
   image_tag="$(grep -ER ^.ppVersion ../scripts/helmcharts/openreplay/charts/$chart | xargs | awk '{print $2}'  | awk -F. -v OFS=. '{$NF += 1 ; print}')"
-  [[ $ee == "true" ]] && { 
+  [[ $ee == "true" ]] && {
     image_tag="${image_tag}-ee"
   }
 }
@@ -73,4 +73,6 @@ function build_api(){
 check_prereq
 build_api $1
 echo buil_complete
-[[ $PATCH -eq 1 ]] && update_helm_release sourcemapreader
+if [[ $PATCH -eq 1 ]]; then
+  update_helm_release sourcemapreader
+fi
\ No newline at end of file