Corkman Justin McCarthy will manage the Waterford senior hurling team next season for what will be his sixth year in charge.