diff --git a/xos-core/templates/_helpers.tpl b/xos-core/templates/_helpers.tpl
index 2d2afb7..f55e3be 100644
--- a/xos-core/templates/_helpers.tpl
+++ b/xos-core/templates/_helpers.tpl
@@ -1,25 +1,24 @@
+{{- /*
+Copyright 2017-present Open Networking Foundation
 
-{{- /* 
- Copyright 2017-present Open Networking Foundation 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
 
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License. 
- */ -}}
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/ -}}
 
 {{- define "xos-core.release_labels" }}
 app: {{ printf "%s-%s" .Release.Name .Chart.Name | trunc 63 }}
-version: {{ .Chart.Version }}
+chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 release: {{ .Release.Name }}
+heritage: {{ .Release.Service }}
+version: {{ .Chart.Version }}
 {{- end }}
-{{- define "xos-core.full_name" -}}
-{{- printf "%s-%s" .Release.Name .Chart.Name | trunc 63 -}}
-{{- end -}}
+