diff --git a/api/build.sh b/api/build.sh
index 3f1504342..d66a54ab9 100644
--- a/api/build.sh
+++ b/api/build.sh
@@ -18,17 +18,19 @@ check_prereq() {
 }
 
 function build_api(){
+    tag=""
     # Copy enterprise code
     [[ $1 == "ee" ]] && {
         cp -rf ../ee/api/* ./
         cp -rf ../ee/api/.chalice/* ./.chalice/
         envarg="default-ee"
+        tag="ee-"
     }
     docker build -f ./Dockerfile --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/chalice:${git_sha1} .
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/chalice:${git_sha1}
-        docker tag ${DOCKER_REPO:-'local'}/chalice:${git_sha1} ${DOCKER_REPO:-'local'}/chalice:latest
-        docker push ${DOCKER_REPO:-'local'}/chalice:latest
+        docker tag ${DOCKER_REPO:-'local'}/chalice:${git_sha1} ${DOCKER_REPO:-'local'}/chalice:${tag}latest
+        docker push ${DOCKER_REPO:-'local'}/chalice:${tag}latest
     }
 }