Update to use new config approach instead of a template