diff --git a/archive_build.sh b/archive_build.sh
index fdce71f8ce..ceefc65cd8 100755
--- a/archive_build.sh
+++ b/archive_build.sh
@@ -234,6 +234,7 @@ echo "$LAST_CHANGE" > "${FLAGS_to}/LATEST"
 # Make sure files are readable
 chmod 644 "$ZIPFILE" "${FLAGS_to}/LATEST"
 chmod 755 "$OUTDIR"
+cp -f  "${FLAGS_from}/au-generator.zip" "${OUTDIR}/"
 
 
 function gsutil_archive() {
diff --git a/build_image b/build_image
index bd49af5054..722d704f96 100755
--- a/build_image
+++ b/build_image
@@ -702,6 +702,14 @@ create_base_image() {
   trap - EXIT
 }
 
+generate_au_zip () {
+  local lgenerateauzip="${SCRIPTS_DIR}/generate_au_zip.py"
+  local largs="-o ${OUTPUT_DIR}"
+  ! -d "${OUTPUT_DIR}" && mkdir -p "${OUTPUT_DIR}" 
+  info "Running ${lgenerateauzip} ${largs} for generating AU updater zip file"
+  $lgenerateauzip $largs
+}
+
 # Create the output directory.
 mkdir -p "${OUTPUT_DIR}"
 mkdir -p "${ROOT_FS_DIR}"
@@ -782,6 +790,8 @@ rm -f "${ROOT_FS_IMG}" "${STATEFUL_FS_IMG}" "${OUTPUT_DIR}/vmlinuz.image" \
   "${ESP_FS_IMG}" "${OEM_FS_IMG}" "${OUTPUT_DIR}/vmlinuz_hd.vblock"
 rmdir "${ROOT_FS_DIR}" "${STATEFUL_FS_DIR}" "${OEM_FS_DIR}" "${ESP_FS_DIR}"
 
+# Generating AU generator zip file to run outside chroot
+generate_au_zip || echo "Failed generating AU zip file - ignoring Error..."
 # Create a 'latest' link
 rm -f ${FLAGS_output_root}/${FLAGS_board}/latest
 ln -s $(basename ${OUTPUT_DIR}) ${FLAGS_output_root}/${FLAGS_board}/latest