AMI-396 prepare for running in AWS