We’re exploring an idea for a quick-win here on stock label custom templates which might well mean we can have a good solution in place quickly. We’re hoping to allow simple editing of the labels on a per-container type basis, but there are some unknowns left in the proof of concept still, so hopefully, they’ll work out as we hope 
Jack, have you tried this setting in Settings → Label settings as this might do exactly what you’re looking for?
