Change to caf repo's for multi-device support