Fix demo to use build service