Move back to syncing cm build targets