Update s3 to use ninja-drivers