Back to using cerbero master