Switch to aws-cli