diff --git a/bbsim-sadis-server/Chart.yaml b/bbsim-sadis-server/Chart.yaml
index 70644a5..8412062 100644
--- a/bbsim-sadis-server/Chart.yaml
+++ b/bbsim-sadis-server/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: "bbsim-sadis-server"
-version: "0.3.1"
+version: "0.3.2"
 description: "A Helm chart for Voltha BBSIM sadis server"
 keywords:
   - "onf"
diff --git a/bbsim-sadis-server/templates/deployment.yaml b/bbsim-sadis-server/templates/deployment.yaml
index db42901..0ec0bbe 100644
--- a/bbsim-sadis-server/templates/deployment.yaml
+++ b/bbsim-sadis-server/templates/deployment.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.
diff --git a/bbsim-sadis-server/templates/permissions.yaml b/bbsim-sadis-server/templates/permissions.yaml
index ecff359..e724ee7 100644
--- a/bbsim-sadis-server/templates/permissions.yaml
+++ b/bbsim-sadis-server/templates/permissions.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.
diff --git a/bbsim-sadis-server/templates/service.yaml b/bbsim-sadis-server/templates/service.yaml
index 6473cbb..c23aae4 100644
--- a/bbsim-sadis-server/templates/service.yaml
+++ b/bbsim-sadis-server/templates/service.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.
diff --git a/bbsim-sadis-server/values.yaml b/bbsim-sadis-server/values.yaml
index 6cd326f..c87a85c 100644
--- a/bbsim-sadis-server/values.yaml
+++ b/bbsim-sadis-server/values.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.
diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index e5ff888..4b34a83 100644
--- a/bbsim/Chart.yaml
+++ b/bbsim/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2018-2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2018-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.
@@ -16,5 +16,5 @@
 description: Broadband Simulator
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 4.8.7
+version: 4.8.8
 appVersion: 1.12.10
diff --git a/bbsim/templates/_helpers.tpl b/bbsim/templates/_helpers.tpl
index 77add5b..4a962c7 100644
--- a/bbsim/templates/_helpers.tpl
+++ b/bbsim/templates/_helpers.tpl
@@ -1,6 +1,6 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
-Copyright 2018-2022 Open Networking Foundation (ONF) and the ONF Contributors
+Copyright 2018-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.
diff --git a/bbsim/templates/configmap-pon.yaml b/bbsim/templates/configmap-pon.yaml
index 750e8ce..32c9df2 100644
--- a/bbsim/templates/configmap-pon.yaml
+++ b/bbsim/templates/configmap-pon.yaml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2022-present Open Networking Foundation
+# Copyright 2022-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.
diff --git a/bbsim/templates/configmap-services.yaml b/bbsim/templates/configmap-services.yaml
index 49c5409..eab233b 100644
--- a/bbsim/templates/configmap-services.yaml
+++ b/bbsim/templates/configmap-services.yaml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-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.
diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index 6bb06e9..9db6a84 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-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.
diff --git a/bbsim/templates/service.yaml b/bbsim/templates/service.yaml
index 8b19af6..7f00932 100644
--- a/bbsim/templates/service.yaml
+++ b/bbsim/templates/service.yaml
@@ -1,5 +1,5 @@
 ---
-# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-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.
diff --git a/bbsim/values.yaml b/bbsim/values.yaml
index 93ee026..e5bdbdf 100644
--- a/bbsim/values.yaml
+++ b/bbsim/values.yaml
@@ -1,4 +1,4 @@
-# Copyright 2018-present Open Networking Foundation
+# Copyright 2018-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.
diff --git a/makefiles/consts.mk b/makefiles/consts.mk
index 2e5651f..2a6531b 100644
--- a/makefiles/consts.mk
+++ b/makefiles/consts.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (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/makefiles/include.mk b/makefiles/include.mk
index aa8c402..db15c47 100644
--- a/makefiles/include.mk
+++ b/makefiles/include.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (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/makefiles/lint/Makefile b/makefiles/lint/Makefile
index 2754d0f..c274549 100644
--- a/makefiles/lint/Makefile
+++ b/makefiles/lint/Makefile
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2017-2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2017-2023 Open Networking Foundation (ONF) and the ONF Contributors
 # SPDX-FileCopyrightText: 2022-present Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
diff --git a/makefiles/lint/helm/include.mk b/makefiles/lint/helm/include.mk
index 936454f..b430d48 100644
--- a/makefiles/lint/helm/include.mk
+++ b/makefiles/lint/helm/include.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (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/makefiles/lint/include.mk b/makefiles/lint/include.mk
index d53a456..c702d90 100644
--- a/makefiles/lint/include.mk
+++ b/makefiles/lint/include.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (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/makefiles/lint/yaml.mk b/makefiles/lint/yaml.mk
index 8a9367b..424fa89 100644
--- a/makefiles/lint/yaml.mk
+++ b/makefiles/lint/yaml.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (ONF) and the ONF Contributors
 # -----------------------------------------------------------------------
 
 ##-------------------##
diff --git a/makefiles/lint/yaml/.yamllint b/makefiles/lint/yaml/.yamllint
index 6a4fc1e..f11a5dd 100644
--- a/makefiles/lint/yaml/.yamllint
+++ b/makefiles/lint/yaml/.yamllint
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (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/makefiles/lint/yaml/python.mk b/makefiles/lint/yaml/python.mk
index 868d9b7..24093d7 100644
--- a/makefiles/lint/yaml/python.mk
+++ b/makefiles/lint/yaml/python.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (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/makefiles/lint/yaml/yamllint.helm b/makefiles/lint/yaml/yamllint.helm
index 6c7787b..6cbd6ca 100644
--- a/makefiles/lint/yaml/yamllint.helm
+++ b/makefiles/lint/yaml/yamllint.helm
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (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/makefiles/lint/yaml/yamllint.mk b/makefiles/lint/yaml/yamllint.mk
index c83d25d..c0d8598 100644
--- a/makefiles/lint/yaml/yamllint.mk
+++ b/makefiles/lint/yaml/yamllint.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (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/makefiles/variables.mk b/makefiles/variables.mk
index 72d449b..3790840 100644
--- a/makefiles/variables.mk
+++ b/makefiles/variables.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 Open Networking Foundation (ONF) and the ONF Contributors
+# Copyright 2022-2023 Open Networking Foundation (ONF) and the ONF Contributors (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/Chart.yaml b/voltha-adapter-openolt/Chart.yaml
index 854ddb0..1b63d82 100644
--- a/voltha-adapter-openolt/Chart.yaml
+++ b/voltha-adapter-openolt/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-openolt"
-version: "2.11.3"
+version: "2.11.4"
 description: "A Helm chart for Voltha OpenOLT Adapter"
 keywords:
   - "onf"
diff --git a/voltha-adapter-openolt/templates/_helpers.tpl b/voltha-adapter-openolt/templates/_helpers.tpl
index bf89b45..55fd185 100644
--- a/voltha-adapter-openolt/templates/_helpers.tpl
+++ b/voltha-adapter-openolt/templates/_helpers.tpl
@@ -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.
diff --git a/voltha-adapter-openolt/templates/openolt-deploy.yaml b/voltha-adapter-openolt/templates/openolt-deploy.yaml
index a9b8fad..18259e8 100644
--- a/voltha-adapter-openolt/templates/openolt-deploy.yaml
+++ b/voltha-adapter-openolt/templates/openolt-deploy.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.
diff --git a/voltha-adapter-openolt/templates/openolt-profile-svc.yaml b/voltha-adapter-openolt/templates/openolt-profile-svc.yaml
index 20ae8a0..dd0b276 100644
--- a/voltha-adapter-openolt/templates/openolt-profile-svc.yaml
+++ b/voltha-adapter-openolt/templates/openolt-profile-svc.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.
diff --git a/voltha-adapter-openolt/templates/openolt-svc.yaml b/voltha-adapter-openolt/templates/openolt-svc.yaml
index 49fe71e..d7d93a4 100644
--- a/voltha-adapter-openolt/templates/openolt-svc.yaml
+++ b/voltha-adapter-openolt/templates/openolt-svc.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.
diff --git a/voltha-adapter-openolt/values.yaml b/voltha-adapter-openolt/values.yaml
index 4bd1b68..3a538f7 100644
--- a/voltha-adapter-openolt/values.yaml
+++ b/voltha-adapter-openolt/values.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.
diff --git a/voltha-adapter-openonu/Chart.yaml b/voltha-adapter-openonu/Chart.yaml
index 7f458af..ebc1649 100644
--- a/voltha-adapter-openonu/Chart.yaml
+++ b/voltha-adapter-openonu/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-openonu"
-version: "2.10.3"
+version: "2.11.0"
 description: "A Helm chart for Voltha OpenONU Adapter"
 keywords:
   - "onf"
diff --git a/voltha-adapter-openonu/templates/_helpers.tpl b/voltha-adapter-openonu/templates/_helpers.tpl
index 2cf8200..c4b194c 100644
--- a/voltha-adapter-openonu/templates/_helpers.tpl
+++ b/voltha-adapter-openonu/templates/_helpers.tpl
@@ -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.
diff --git a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml b/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
index f36292c..12fc300 100644
--- a/voltha-adapter-openonu/templates/openonu-go-deploy.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-deploy.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.
diff --git a/voltha-adapter-openonu/templates/openonu-go-profile-svc.yaml b/voltha-adapter-openonu/templates/openonu-go-profile-svc.yaml
index ae8479f..ef3a0e0 100644
--- a/voltha-adapter-openonu/templates/openonu-go-profile-svc.yaml
+++ b/voltha-adapter-openonu/templates/openonu-go-profile-svc.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.
diff --git a/voltha-adapter-openonu/templates/openonu-svc.yaml b/voltha-adapter-openonu/templates/openonu-svc.yaml
index c8cfedd..17c9ae7 100644
--- a/voltha-adapter-openonu/templates/openonu-svc.yaml
+++ b/voltha-adapter-openonu/templates/openonu-svc.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.
diff --git a/voltha-adapter-openonu/values.yaml b/voltha-adapter-openonu/values.yaml
index c2c6cac..dfc9dc6 100644
--- a/voltha-adapter-openonu/values.yaml
+++ b/voltha-adapter-openonu/values.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.
diff --git a/voltha-adapter-simulated/Chart.yaml b/voltha-adapter-simulated/Chart.yaml
index 729c008..436b731 100644
--- a/voltha-adapter-simulated/Chart.yaml
+++ b/voltha-adapter-simulated/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha-adapter-simulated"
-version: "2.3.1"
+version: "2.3.2"
 description: "A Helm chart for Voltha Simulated Adapter"
 keywords:
   - "onf"
diff --git a/voltha-adapter-simulated/templates/_helpers.tpl b/voltha-adapter-simulated/templates/_helpers.tpl
index b0d4716..94f1d5b 100644
--- a/voltha-adapter-simulated/templates/_helpers.tpl
+++ b/voltha-adapter-simulated/templates/_helpers.tpl
@@ -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.
diff --git a/voltha-adapter-simulated/templates/olt-adapter-deploy.yaml b/voltha-adapter-simulated/templates/olt-adapter-deploy.yaml
index 5cf7b01..4b8b8d3 100644
--- a/voltha-adapter-simulated/templates/olt-adapter-deploy.yaml
+++ b/voltha-adapter-simulated/templates/olt-adapter-deploy.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.
diff --git a/voltha-adapter-simulated/templates/onu-adapter-deploy.yaml b/voltha-adapter-simulated/templates/onu-adapter-deploy.yaml
index 3fc8cb4..95d467b 100644
--- a/voltha-adapter-simulated/templates/onu-adapter-deploy.yaml
+++ b/voltha-adapter-simulated/templates/onu-adapter-deploy.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.
diff --git a/voltha-adapter-simulated/values.yaml b/voltha-adapter-simulated/values.yaml
index 019478b..e7db00e 100644
--- a/voltha-adapter-simulated/values.yaml
+++ b/voltha-adapter-simulated/values.yaml
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Open Networking Foundation (ONF) and the ONF Contributors
+# 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.
diff --git a/voltha-go-controller/Chart.yaml b/voltha-go-controller/Chart.yaml
index 8bfbcdc..9d4c87e 100644
--- a/voltha-go-controller/Chart.yaml
+++ b/voltha-go-controller/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-present Open Networking Foundation
+# Copyright 2022-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.
@@ -16,4 +16,4 @@
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: voltha-go-controller
-version: 0.1.1
+version: 0.1.2
diff --git a/voltha-go-controller/templates/deployment.yaml b/voltha-go-controller/templates/deployment.yaml
index bd51a50..ff62ea6 100644
--- a/voltha-go-controller/templates/deployment.yaml
+++ b/voltha-go-controller/templates/deployment.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-present Open Networking Foundation
+# Copyright 2022-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.
diff --git a/voltha-go-controller/templates/service.yaml b/voltha-go-controller/templates/service.yaml
index 4833f2a..50b5c79 100644
--- a/voltha-go-controller/templates/service.yaml
+++ b/voltha-go-controller/templates/service.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-present Open Networking Foundation
+# Copyright 2022-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.
diff --git a/voltha-go-controller/values.yaml b/voltha-go-controller/values.yaml
index 346724e..ce9fe7a 100644
--- a/voltha-go-controller/values.yaml
+++ b/voltha-go-controller/values.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-present Open Networking Foundation
+# Copyright 2022-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.
diff --git a/voltha-infra/Chart.yaml b/voltha-infra/Chart.yaml
index c7dbcde..e3fd924 100644
--- a/voltha-infra/Chart.yaml
+++ b/voltha-infra/Chart.yaml
@@ -28,8 +28,8 @@
     url: "https://www.opennetworking.org"
 name: voltha-infra
 
-appVersion: "2.10"
-version: 2.10.10
+appVersion: "2.11"
+version: 2.11.0
 
 dependencies:
   - name: onos-classic
@@ -42,7 +42,7 @@
     condition: redis.enabled
   - name: bbsim-sadis-server
     repository: file://../bbsim-sadis-server
-    version: 0.3.1
+    version: 0.3.2
     condition: bbsim-sadis-server.enabled
   - name: etcd
     repository: https://charts.bitnami.com/bitnami
diff --git a/voltha-infra/templates/_helpers.tpl b/voltha-infra/templates/_helpers.tpl
index bf89b45..55fd185 100644
--- a/voltha-infra/templates/_helpers.tpl
+++ b/voltha-infra/templates/_helpers.tpl
@@ -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.
diff --git a/voltha-infra/templates/etcd-periodic-defrag-cluster-role-binding.yaml b/voltha-infra/templates/etcd-periodic-defrag-cluster-role-binding.yaml
index dc18b1c..eda2090 100644
--- a/voltha-infra/templates/etcd-periodic-defrag-cluster-role-binding.yaml
+++ b/voltha-infra/templates/etcd-periodic-defrag-cluster-role-binding.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.
diff --git a/voltha-infra/templates/etcd-periodic-defrag-cluster-role.yaml b/voltha-infra/templates/etcd-periodic-defrag-cluster-role.yaml
index 610b662..1e83162 100644
--- a/voltha-infra/templates/etcd-periodic-defrag-cluster-role.yaml
+++ b/voltha-infra/templates/etcd-periodic-defrag-cluster-role.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.
diff --git a/voltha-infra/templates/etcd-periodic-defrag.yaml b/voltha-infra/templates/etcd-periodic-defrag.yaml
index 3144f03..34ec4ce 100644
--- a/voltha-infra/templates/etcd-periodic-defrag.yaml
+++ b/voltha-infra/templates/etcd-periodic-defrag.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2021-present Open Networking Foundation
+# Copyright 2021-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.
diff --git a/voltha-infra/templates/ingress_etcd.yaml b/voltha-infra/templates/ingress_etcd.yaml
index 9fa1bee..4f40d5e 100644
--- a/voltha-infra/templates/ingress_etcd.yaml
+++ b/voltha-infra/templates/ingress_etcd.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-present Open Networking Foundation
+# Copyright 2021-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.
diff --git a/voltha-stack/Chart.yaml b/voltha-stack/Chart.yaml
index deb02f9..6fb90bf 100644
--- a/voltha-stack/Chart.yaml
+++ b/voltha-stack/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.
@@ -27,23 +27,23 @@
     url: "https://www.opennetworking.org"
 name: voltha-stack
 
-appVersion: "2.10"
-version: 2.10.10
+appVersion: "2.11"
+version: 2.11.0
 
 dependencies:
   - name: voltha
     repository: file://../voltha
-    version: 2.11.5
+    version: 2.11.6
     condition: voltha.enabled
   - name: voltha-adapter-openonu
     repository: file://../voltha-adapter-openonu
-    version: 2.10.3
+    version: 2.11.0
     condition: voltha-adapter-openonu.enabled
   - name: voltha-adapter-openolt
     repository: file://../voltha-adapter-openolt
-    version: 2.11.3
+    version: 2.11.4
     condition: voltha-adapter-openolt.enabled
   - name: voltha-go-controller
     repository: file://../voltha-go-controller
-    version: 0.1.1
+    version: 0.1.2
     condition: voltha-go-controller.enabled
diff --git a/voltha-stack/values.yaml b/voltha-stack/values.yaml
index bebc6ca..cac4667 100644
--- a/voltha-stack/values.yaml
+++ b/voltha-stack/values.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.
diff --git a/voltha-tracing/Chart.yaml b/voltha-tracing/Chart.yaml
index 4e4db32..a65a23b 100644
--- a/voltha-tracing/Chart.yaml
+++ b/voltha-tracing/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: v1
 name: "voltha-tracing"
-version: "1.0.1"
+version: "1.0.2"
 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 48bae0f..55fd185 100644
--- a/voltha-tracing/templates/_helpers.tpl
+++ b/voltha-tracing/templates/_helpers.tpl
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Open Networking Foundation (ONF) and the ONF Contributors
+# 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.
diff --git a/voltha-tracing/templates/jaeger-deploy.yaml b/voltha-tracing/templates/jaeger-deploy.yaml
index 573c2e5..75ae9ab 100644
--- a/voltha-tracing/templates/jaeger-deploy.yaml
+++ b/voltha-tracing/templates/jaeger-deploy.yaml
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Open Networking Foundation (ONF) and the ONF Contributors
+# 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.
diff --git a/voltha-tracing/templates/tracing-agent-svc.yaml b/voltha-tracing/templates/tracing-agent-svc.yaml
index e890bb6..74d40f9 100644
--- a/voltha-tracing/templates/tracing-agent-svc.yaml
+++ b/voltha-tracing/templates/tracing-agent-svc.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.
diff --git a/voltha-tracing/templates/tracing-gui-svc.yaml b/voltha-tracing/templates/tracing-gui-svc.yaml
index 9bb0b8f..3f19ee5 100644
--- a/voltha-tracing/templates/tracing-gui-svc.yaml
+++ b/voltha-tracing/templates/tracing-gui-svc.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.
diff --git a/voltha-tracing/values.yaml b/voltha-tracing/values.yaml
index 6b9bf0b..634cacb 100644
--- a/voltha-tracing/values.yaml
+++ b/voltha-tracing/values.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.
diff --git a/voltha/Chart.yaml b/voltha/Chart.yaml
index b791ff2..48d5fe5 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -1,4 +1,4 @@
-# Copyright 2019-2022 Open Networking Foundation (ONF) and the ONF Contributors
+# 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"
-version: "2.11.5"
+version: "2.11.6"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"
@@ -33,4 +33,4 @@
 
 # app version applies to multiple components with potentially different
 # container image versions
-appVersion: "2.10"
+appVersion: "2.11"
diff --git a/voltha/templates/_helpers.tpl b/voltha/templates/_helpers.tpl
index 2e399d3..d1cb6a7 100644
--- a/voltha/templates/_helpers.tpl
+++ b/voltha/templates/_helpers.tpl
@@ -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.
diff --git a/voltha/templates/api-svc.yaml b/voltha/templates/api-svc.yaml
index add4aba..e4303d7 100644
--- a/voltha/templates/api-svc.yaml
+++ b/voltha/templates/api-svc.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.
diff --git a/voltha/templates/core-deploy.yaml b/voltha/templates/core-deploy.yaml
index 807faa1..56d6f43 100644
--- a/voltha/templates/core-deploy.yaml
+++ b/voltha/templates/core-deploy.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.
diff --git a/voltha/templates/core-profile-svc.yaml b/voltha/templates/core-profile-svc.yaml
index 3705440..b44c31f 100644
--- a/voltha/templates/core-profile-svc.yaml
+++ b/voltha/templates/core-profile-svc.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.
diff --git a/voltha/templates/core-svc.yaml b/voltha/templates/core-svc.yaml
index e5aa343..b2ccd28 100644
--- a/voltha/templates/core-svc.yaml
+++ b/voltha/templates/core-svc.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.
diff --git a/voltha/templates/ingress.yaml b/voltha/templates/ingress.yaml
index 01158cc..157af9c 100644
--- a/voltha/templates/ingress.yaml
+++ b/voltha/templates/ingress.yaml
@@ -1,4 +1,4 @@
-# Copyright 2021-present Open Networking Foundation
+# Copyright 2021-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.
diff --git a/voltha/templates/ofagent-deploy.yaml b/voltha/templates/ofagent-deploy.yaml
index 2aac00c..fef182d 100644
--- a/voltha/templates/ofagent-deploy.yaml
+++ b/voltha/templates/ofagent-deploy.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.
diff --git a/voltha/templates/ofagent-profile-svc.yaml b/voltha/templates/ofagent-profile-svc.yaml
index 5d091c3..2bd6bd6 100644
--- a/voltha/templates/ofagent-profile-svc.yaml
+++ b/voltha/templates/ofagent-profile-svc.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.
diff --git a/voltha/values.yaml b/voltha/values.yaml
index 03182a5..640b3bc 100644
--- a/voltha/values.yaml
+++ b/voltha/values.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.