update/simplify specs to reflect new r509 configs