build: First steps towards fixing roomservice