ALM-267 fixed AWS support