Update versions to match EAP/WFK