add new custom AMI to CF script and remove redundant build steps