diff --git a/api/build.sh b/api/build.sh
index c0ede73da..ef8f8fc3d 100644
--- a/api/build.sh
+++ b/api/build.sh
@@ -26,17 +26,13 @@ function build_api(){
         tag="ee-"
     }
     docker build -f ./Dockerfile --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/api:${git_sha1} .
-    docker build -f ./Dockerfile.alerts --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/alerts:${git_sha1} .
     [[ $PUSH_IMAGE -eq 1 ]] && {
         docker push ${DOCKER_REPO:-'local'}/api:${git_sha1}
         docker tag ${DOCKER_REPO:-'local'}/api:${git_sha1} ${DOCKER_REPO:-'local'}/api:${tag}latest
         docker push ${DOCKER_REPO:-'local'}/api:${tag}latest
-
-        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
-    }
+}
 }
 
 check_prereq
 build_api $1
+bash build_alerts.sh
\ No newline at end of file
diff --git a/api/build_alerts.sh b/api/build_alerts.sh
new file mode 100644
index 000000000..74bf72438
--- /dev/null
+++ b/api/build_alerts.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# Script to build alerts module
+# flags to accept:
+# envarg: build for enterprise edition.
+# Default will be OSS build.
+
+# Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh <ee>
+
+function make_submodule() {
+    # -- this part was generated by modules_lister.py --
+    mkdir alerts
+    cp -R ./{app_alerts,schemas}.py ./alerts/
+    mkdir -p ./alerts/chalicelib/
+    cp -R ./chalicelib/__init__.py ./alerts/chalicelib/
+    mkdir -p ./alerts/chalicelib/core/
+    cp -R ./chalicelib/core/{__init__,alerts_processor,sessions,events,issues,sessions_metas,metadata,projects,users,authorizers,tenants,assist,events_ios,sessions_mobs,errors,sourcemaps,sourcemaps_parser,resources,performance_event,alerts,notifications,slack,collaboration_slack,webhook}.py ./alerts/chalicelib/core/
+    mkdir -p ./alerts/chalicelib/utils/
+    cp -R ./chalicelib/utils/{__init__,TimeUTC,pg_client,helper,event_filter_definition,dev,email_helper,email_handler,smtp,s3,metrics_helper}.py ./alerts/chalicelib/utils/
+    # -- end of generated part
+
+    cp Dockerfile.alerts ./alerts/
+    cd alerts
+}
+
+git_sha1=${IMAGE_TAG:-$(git rev-parse HEAD)}
+envarg="default-foss"
+check_prereq() {
+    which docker || {
+        echo "Docker not installed, please install docker."
+        exit=1
+    }
+    [[ exit -eq 1 ]] && exit 1
+}
+
+function build_api(){
+    tag=""
+    # Copy enterprise code
+    [[ $1 == "ee" ]] && {
+        cp -rf ../ee/api/* ./
+        envarg="default-ee"
+        tag="ee-"
+    }
+    make_submodule
+    docker build -f ./Dockerfile.alerts --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/alerts:${git_sha1} .
+    [[ $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
+    }
+    rm -rf alerts
+}
+
+check_prereq
+build_api $1