They are not going to change much in the Armoury System as it is now. They will be implementing a separate Job System to help people assign roles to themselves in a future patch.