Merge "Update build script for apps and dockers"