shift to new s3 resolver