diff --git a/mbedtls-amis.yaml b/mbedtls-amis.yaml
index e6d4f6f..a83cc4d 100644
--- a/mbedtls-amis.yaml
+++ b/mbedtls-amis.yaml
@@ -14,21 +14,18 @@
     node: build-amd64-private
     concurrent: false
     display-name: 'build AMIs for mbedtls'
-    triggers:
-        - gerrit:
-            server-name: 'review.trustedfirmware.org'
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'next/ci/mbedtls-amis'
-                  branches:
-                    - branch-compare-type: 'PLAIN'
-                      branch-pattern: 'master'
-            silent-start: true
+    parameters:
+    - bool:
+        name: BUILD_UBUNTU_AMI
+        default: true
+        description: Build Ubuntu AMI
+    - bool:
+        name: BUILD_FREEBSD_AMI
+        default: false
+        description: Build FreeBSD AMI
     builders:
         - shell:
             !include-raw: mbedtls-amis/builders.sh
     publishers:
         - email:
-            recipients: linaro-infrastructure-errors@lists.linaro.org
+            recipients: linaro-infrastructure-errors@lists.linaro.org,arthur.she@linaro.org
diff --git a/mbedtls-amis/builders.sh b/mbedtls-amis/builders.sh
old mode 100644
new mode 100755
index 95747b2..2dcd4e7
--- a/mbedtls-amis/builders.sh
+++ b/mbedtls-amis/builders.sh
@@ -1,11 +1,21 @@
 #!/bin/bash
 
+AMI=""
+[ ${BUILD_UBUNTU_AMI} == "true" ] && AMI="${AMI} ubuntu"
+[ ${BUILD_FREEBSD_AMI} == "true" ] && AMI="${AMI} freebsd"
+
+[ -z "${AMI}" ] && echo "Build Nothing.." && exit
+
 rm -rf mbedtls-amis
 git clone https://git.trustedfirmware.org/next/ci/mbedtls-amis.git
 cd mbedtls-amis
 
-# Dump packer_config.json to job log
-cat packer_config.json
-
-packer build packer_config.json
+for os in ${AMI}
+do
+    echo -e "\nBuild ${os} AMI"
+    [ ! -f "packer_${os}.json" ] && echo -e "\nERROR: Can not find packer_${os}.json" && exit -1
+    # Dump packer_config.json to job log
+    cat packer_${os}.json
+    packer build packer_${os}.json
+done