Infra: AWS deployment improvements