More helm-ification