Switch to unified aws attributes