diff --git a/bbsim-sadis-server/templates/deployment.yaml b/bbsim-sadis-server/templates/deployment.yaml
index 1584bb3..db42901 100644
--- a/bbsim-sadis-server/templates/deployment.yaml
+++ b/bbsim-sadis-server/templates/deployment.yaml
@@ -16,32 +16,32 @@
 kind: "Deployment"
 metadata:
   name: "bbsim-sadis-server"
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{.Release.Namespace | quote}}
 spec:
-  replicas: {{ .Values.replicas | int }}
+  replicas: {{.Values.replicas | int}}
   selector:
     matchLabels:
       app: "bbsim-sadis-server"
-      release: {{ .Release.Name | quote }}
+      release: {{.Release.Name | quote}}
   template:
     metadata:
-      namespace: {{ .Release.Namespace | quote }}
+      namespace: {{.Release.Namespace | quote}}
       labels:
         app: "bbsim-sadis-server"
-        release: {{ .Release.Name | quote }}
+        release: {{.Release.Name | quote}}
         app.kubernetes.io/name: "bbsim-sadis-server"
-        app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+        app.kubernetes.io/version: {{.Chart.AppVersion | quote}}
         app.kubernetes.io/component: "sadis-server"
         app.kubernetes.io/part-of: "voltha"
-        app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
+        app.kubernetes.io/managed-by: {{.Release.Service | quote}}
         helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     spec:
-      serviceAccountName: {{ .Values.serviceAccountName | quote }}
+      serviceAccountName: {{.Values.serviceAccountName | quote}}
       containers:
         - name: "sadis"
           image: "{{ tpl .Values.images.bbsim_sadis_server.registry . }}{{ tpl .Values.images.bbsim_sadis_server.repository . }}:{{ tpl ( tpl .Values.images.bbsim_sadis_server.tag . ) . }}"
-          imagePullPolicy: {{ tpl .Values.images.bbsim_sadis_server.pullPolicy . | quote }}
-          command: [ "/app/bbsim-sadis-server" ]
+          imagePullPolicy: {{tpl .Values.images.bbsim_sadis_server.pullPolicy . | quote}}
+          command: ["/app/bbsim-sadis-server"]
           args:
             - "-log_level={{.Values.global.log_level}}"
             - "-log_format={{.Values.global.log_format}}"
diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index e9475ec..e5ff888 100644
--- a/bbsim/Chart.yaml
+++ b/bbsim/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@
 description: Broadband Simulator
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 4.8.6
+version: 4.8.7
 appVersion: 1.12.10
diff --git a/bbsim/templates/_helpers.tpl b/bbsim/templates/_helpers.tpl
index af6ac67..77add5b 100644
--- a/bbsim/templates/_helpers.tpl
+++ b/bbsim/templates/_helpers.tpl
@@ -1,6 +1,6 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
-Copyright 2018-present Open Networking Foundation
+Copyright 2018-2022 Open Networking Foundation (ONF) and the ONF Contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index a7c9f56..4bd1b68 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.yaml
@@ -33,11 +33,11 @@
     heartbeat_fail_interval: "31s"
     check_onu_exist_on_discovery: false
 
-  #enable OMCC encryption
+  # enable OMCC encryption
   omcc_encryption: false
-  #enable ONU stats
+  # enable ONU stats
   enable_onu_stats: false
-  #enable GEM stats
+  # enable GEM stats
   enable_gem_stats: false
 
   # Configure Log Correlation
@@ -99,7 +99,7 @@
   kv_store_data_prefix: 'service/{{ .Values.global.stack_name }}_voltha'
   heartbeat_check_interval: '{{ .Values.global.adapter_open_olt.heartbeat_check_interval }}'
   heartbeat_fail_interval: '{{ .Values.global.adapter_open_olt.heartbeat_fail_interval }}'
-  check_onu_exist_on_discovery: '{{ .Values.global.adapter_open_olt.check_onu_exist_on_discovery }}' 
+  check_onu_exist_on_discovery: '{{ .Values.global.adapter_open_olt.check_onu_exist_on_discovery }}'
   rpc_timeout: '{{ .Values.global.rpc_timeout }}'
   endpoints:
     # core_endpoint: '{{ .Values.global.adapter_open_olt.core_endpoint }}'
diff --git a/voltha-adapter-simulated/Chart.yaml b/voltha-adapter-simulated/Chart.yaml
index 27745ae..729c008 100644
--- a/voltha-adapter-simulated/Chart.yaml
+++ b/voltha-adapter-simulated/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2019-present Open Networking Foundation
+# Copyright 2019-2023 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha-adapter-simulated"
-version: "2.3.0"
+version: "2.3.1"
 description: "A Helm chart for Voltha Simulated Adapter"
 keywords:
   - "onf"
diff --git a/voltha-adapter-simulated/values.yaml b/voltha-adapter-simulated/values.yaml
index 21a90fc..019478b 100644
--- a/voltha-adapter-simulated/values.yaml
+++ b/voltha-adapter-simulated/values.yaml
@@ -1,4 +1,4 @@
-# Copyright 2019-present Open Networking Foundation
+# Copyright 2019-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/voltha-infra/values.yaml b/voltha-infra/values.yaml
index c3be649..4c37ea9 100644
--- a/voltha-infra/values.yaml
+++ b/voltha-infra/values.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/voltha-tracing/Chart.yaml b/voltha-tracing/Chart.yaml
index 4255151..4e4db32 100644
--- a/voltha-tracing/Chart.yaml
+++ b/voltha-tracing/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2023 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 ---
 apiVersion: v1
 name: "voltha-tracing"
-version: "1.0.0"
+version: "1.0.1"
 description: "A Helm chart for deploying Jaeger all-in-one container for Trace data collection and analysis"
 keywords:
   - "onf"
diff --git a/voltha-tracing/templates/_helpers.tpl b/voltha-tracing/templates/_helpers.tpl
index bf89b45..48bae0f 100644
--- a/voltha-tracing/templates/_helpers.tpl
+++ b/voltha-tracing/templates/_helpers.tpl
@@ -1,4 +1,4 @@
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/voltha-tracing/templates/jaeger-deploy.yaml b/voltha-tracing/templates/jaeger-deploy.yaml
index 084ba4e..573c2e5 100644
--- a/voltha-tracing/templates/jaeger-deploy.yaml
+++ b/voltha-tracing/templates/jaeger-deploy.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-present Open Networking Foundation
+# Copyright 2020-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index 8061e8e..42a4adc 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2019-present Open Networking Foundation
+# Copyright 2019-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.