Changing serviceId to bitmakerlabs