Fix upstream resource to be OS aware like the other resources