keymaster: switch to caf variant

this is cleaner then adding again flags