As noted in #860, there were a few places where the alpine and nginx
charts differed. This unifies the two, using common labels and
conventions.