Fix s3 urls in builder script. Also better naming of intermediate files