Track more repos and Bluetooth from CM