CHG: Update configurations to use new hyphen syntax