update with further updates to config templates, update upstream module