Feature/aws images