build: Update roomservice, simplify