Feature/16 ecr integration