diff --git a/Makefile b/Makefile
index a5ca425..fcecb6f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2021-2022 Open Networking Foundation (ONF) and the ONF Contributors
+# 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.
@@ -75,6 +75,15 @@
 helm-repo-tools:
 	git clone "https://gerrit.opencord.org/helm-repo-tools"
 
+lint-local: lint-helm lint-chart
+
+lint-helm:
+	helm-repo-tools/helmlint.sh
+
+lint-chart:
+	helm-repo-tools/chart_version_check.sh
+#	helm-repo-tools/lchart_version_check.sh
+
 ## -----------------------------------------------------------------------
 ## -----------------------------------------------------------------------
 # test-all += test-tags # tagcollisionreject + curl is broken
diff --git a/README.md b/README.md
index 00f3524..3082635 100644
--- a/README.md
+++ b/README.md
@@ -190,20 +190,9 @@
   --set global.log_correlation.enabled=true
 ```
 
-### Use the OpenONU python adapter
+### Use the OpenONU golang adapter
 
-Up to release `0.10.0` of the `voltha-stack` chart you can still use the openonu-py version of the adapter.
-
-> NOTE that this adapter is now unsupported, so you're in uncharted territory from now on.
-
-```shell
-helm upgrade --install --create-namespace \
-  -n voltha voltha onf/voltha-stack \
-  --set global.stack_name=voltha \
-  --set global.voltha_infra_name=voltha-infra \
-  --set global.voltha_infra_namespace=infra \
-  --set voltha-adapter-openonu.use_openonu_adapter_go=false
-```
+https://docs.voltha.org/master/voltha-openonu-adapter-go/README.html
 
 ### Deploy BBSim
 
diff --git a/VERSION b/VERSION
index e4604e3..d854009 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.1
+3.2.2-dev1
diff --git a/examples/att-values.yaml b/examples/att-values.yaml
index 3c2385f..0f70ecc 100644
--- a/examples/att-values.yaml
+++ b/examples/att-values.yaml
@@ -1,6 +1,6 @@
 ---
 
-# 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/examples/dev-values.yaml b/examples/dev-values.yaml
index ecb9a7d..5139620 100644
--- a/examples/dev-values.yaml
+++ b/examples/dev-values.yaml
@@ -1,6 +1,6 @@
 ---
 
-# 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/examples/dt-fttb-values.yaml b/examples/dt-fttb-values.yaml
index b754197..797c8d8 100644
--- a/examples/dt-fttb-values.yaml
+++ b/examples/dt-fttb-values.yaml
@@ -1,6 +1,6 @@
 ---
 
-# 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/examples/dt-values.yaml b/examples/dt-values.yaml
index af5c4e5..1c7c347 100755
--- a/examples/dt-values.yaml
+++ b/examples/dt-values.yaml
@@ -1,6 +1,6 @@
 ---
 
-# 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/examples/pon-interfaces-config.yaml b/examples/pon-interfaces-config.yaml
index 9f0e02a..d609076 100644
--- a/examples/pon-interfaces-config.yaml
+++ b/examples/pon-interfaces-config.yaml
@@ -1,6 +1,6 @@
 ---
 
-# 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/examples/tim-values.yaml b/examples/tim-values.yaml
index c01d960..ba8594a 100644
--- a/examples/tim-values.yaml
+++ b/examples/tim-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/examples/tt-maclearner-values.yaml b/examples/tt-maclearner-values.yaml
index ed0161e..025ce8a 100644
--- a/examples/tt-maclearner-values.yaml
+++ b/examples/tt-maclearner-values.yaml
@@ -1,6 +1,6 @@
 ---
 
-# 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/examples/tt-values.yaml b/examples/tt-values.yaml
index ba2c9aa..e838722 100644
--- a/examples/tt-values.yaml
+++ b/examples/tt-values.yaml
@@ -1,6 +1,6 @@
 ---
 
-# 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/makefiles/lint/helm/include.mk~ b/makefiles/lint/helm/include.mk~
deleted file mode 100644
index a76987e..0000000
--- a/makefiles/lint/helm/include.mk~
+++ /dev/null
@@ -1,153 +0,0 @@
-# -*- makefile -*-
-# -----------------------------------------------------------------------
-# Copyright 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.
-# You may obtain a copy of the License at
-#
-# 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.
-#
-# SPDX-FileCopyrightText: 2022 Open Networking Foundation (ONF) and the ONF Contributors
-# SPDX-License-Identifier: Apache-2.0
-# -----------------------------------------------------------------------
-
-GIT ?= /usr/bin/git
-
-chart-version-check-sh := helm-repo-tools/chart_version_check.sh
-
-## -------------------------------------------------------------------
-## NOTE: This uglyness can go away with proper command line switch use
-## -------------------------------------------------------------------
-##   o USE_LEGACY= (default)
-##       - bridge logic: support existing behavior.
-##       - helmlint.sh contains hardcoded branch='origin/opencord'
-##   o TODO:
-##       - infer values from repository checkout on disk.
-##       - parameterize helmlint.sh
-##       - use simple flags to toggle behavior:
-##           MASTER_BRANCH=1  || --branch master (default)
-##           LOCAL_BRANCH=1   || --branch local)
-##           MY_BRANCH=1      || --branch local
-##       - Better yet: when branch name is known simply pass it:
-##           % make lint-helm BRANCH=alt-branch-name
-## -----------------------------------------------------------------------
-USE_LEGACY = 1
-ifdef USE_LEGACY
-  $(if $(DEBUG),$(info ifdef USE_LEGACY))
-
-  lint-helm-branch ?= $(shell cat .gitreview | grep branch | cut -d '=' -f2)
-
-else
-  $(if $(DEBUG),$(info not USE_LEGACY))
-
-  ifdef LOCAL_BRANCH
-     get-git-branch ?= $(shell $(GIT) branch --show-current)# empty if detached
-     get-git-branch ?= $(shell awk -F '/branch/ {print $$2}' .gitreview)
-     get-git-branch ?= $(error Detected detached head)
-
-  else # master
-     # refs/remotes/origin/HEAD => origin/master
-     get-git-branch ?= $(shell $(GIT) symbolic-ref --short refs/remotes/origin/HEAD)
-  endif
-
-  lint-helm-branch ?= $(COMPARISON_BRANCH)
-  lint-helm-branch ?= $(get-git-branch)
-
-  $(if $(DEBUG),$(info get-git-branch = $(get-git-branch)))
-  $(if $(DEBUG),$(info lint-branch=$(lint-branch)))
-endif
-
-##-------------------##
-##---]  TARGETS  [---##
-##-------------------##
-.PHONY : lint-helm
-lint   : lint-helm
-
-## -----------------------------------------------------------------------
-## Intent: Lint helm charts
-##   o This logic mirrors gerrit/jenkins commit hook behavior.
-##   o Adding to stem incidents of late pull request jenkins failures.
-##   o see: make help VERBOSE=1
-## -----------------------------------------------------------------------
-.PHONY: lint-helm
-lint-helm: $(chart-version-check-sh)# helm-repo-tools
-lint-helm:
-	COMPARISON_BRANCH="$(get-git-branch)" $(chart-version-check-sh)
-#	COMPARISON_BRANCH="$(lint-helm-branch)" $(chart-version-check-sh)
-
-## -----------------------------------------------------------------------
-## Intent: repo:helm-repo-tools
-##   o Use script as a dependency for on-demand cloning.
-##   o Use of repo name (r-h-t) as a dependency is problematic.
-## -----------------------------------------------------------------------
-$(chart-version-check-sh):
-	$(GIT) clone "https://gerrit.opencord.org/helm-repo-tools"
-
-## -----------------------------------------------------------------------
-## Intent: 
-## -----------------------------------------------------------------------
-# branch=`cat .gitreview | grep branch | cut -d '=' -f2`
-pre-commit :: lint-helm
-#	$(chart-version-check-sh) clean
-#	@COMPARISON_BRANCH=origin/$(branch) $(chart-version-check-sh)
-#	$(chart-version-check-sh)
-
-## -----------------------------------------------------------------------
-## [TODO] Extract hardcoded values from lint.sh:
-##    o pass as args
-##    o pass through configs:
-##    o consumer/makefile should prep then invoke htmllint:
-##        + arbitrary repository commit hooks can match build behavior.
-## -----------------------------------------------------------------------
-lint-helm-deps:
-	helm repo add stable https://charts.helm.sh/stable
-	helm repo add rook-release https://charts.rook.io/release
-	helm repo add cord https://charts.opencord.org
-
-## -----------------------------------------------------------------------
-## Intent: Remove generated targets
-## -----------------------------------------------------------------------
-clean ::
-	$(chart-version-check-sh) clean
-
-## -----------------------------------------------------------------------
-## Intent: Remove all non-source targets
-## -----------------------------------------------------------------------
-sterile ::
-	$(RM) helm-repo-tools
-
-## -----------------------------------------------------------------------
-## Intent: Display target help with context
-##   % make help
-##   % make help VERBOSE=1
-## -----------------------------------------------------------------------
-help ::
-	@echo "  lint-helm            Syntax check helm charts"
-ifdef VERBOSE
-	@echo "  lint-helm COMPARISON_BRANCH=1    Local/dev lint (branch != master)"
-endif
-ifdef VERBOSE
-	@echo "  lint-helm-deps       Configure dependent helm charts"
-endif
-
-## -----------------------------------------------------------------------
-## Intent: Future enhancement list
-## -----------------------------------------------------------------------
-todo ::
-	@ehco "[TODO: makefiles/helm/include.mk]"
-	@echo " o Generalize script logic, remove hardcoded values,"
-	@echo " o Update gerrit/jenkins/makefiles/interactive:"
-	@echo "     Lint behavior should be consistent everywhere."
-	@echo " o Fix COMPARSION_BRANCH logic:"
-	@echo "     helm-repo-tools/chart_version_check contains 'opencord/master'"
-	@echo " o Refactor 2 jenkins jobs and lint-helm-deps"
-	@echo "     use everywhere: % make lint-helm"
-
-# [EOF]
diff --git a/voltha-infra/Chart.yaml b/voltha-infra/Chart.yaml
index d30a723..c71435f 100644
--- a/voltha-infra/Chart.yaml
+++ b/voltha-infra/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.
@@ -29,7 +29,7 @@
 name: voltha-infra
 
 appVersion: "2.10"
-version: 2.10.9
+version: 2.10.10-dev1
 
 dependencies:
   - name: onos-classic
diff --git a/voltha-northbound-bbf-adapter/Chart.yaml b/voltha-northbound-bbf-adapter/Chart.yaml
index e7f3cd0..86fa04e 100644
--- a/voltha-northbound-bbf-adapter/Chart.yaml
+++ b/voltha-northbound-bbf-adapter/Chart.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.
@@ -22,5 +22,5 @@
   - "voltha"
   - "bbf"
   - "adapter"
-version: 0.0.1-dev5
+version: 0.0.1-dev6
 appVersion: 0.0.1
diff --git a/voltha-northbound-bbf-adapter/templates/_helpers.tpl b/voltha-northbound-bbf-adapter/templates/_helpers.tpl
index 4330d31..6efae12 100644
--- a/voltha-northbound-bbf-adapter/templates/_helpers.tpl
+++ b/voltha-northbound-bbf-adapter/templates/_helpers.tpl
@@ -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-northbound-bbf-adapter/templates/configmap-startup.yaml b/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml
index 85f2a03..bee63d3 100644
--- a/voltha-northbound-bbf-adapter/templates/configmap-startup.yaml
+++ b/voltha-northbound-bbf-adapter/templates/configmap-startup.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/voltha-northbound-bbf-adapter/templates/deployment.yaml b/voltha-northbound-bbf-adapter/templates/deployment.yaml
index fe09d34..eb337c9 100644
--- a/voltha-northbound-bbf-adapter/templates/deployment.yaml
+++ b/voltha-northbound-bbf-adapter/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-northbound-bbf-adapter/templates/netopeer2-svc.yaml b/voltha-northbound-bbf-adapter/templates/netopeer2-svc.yaml
index b8f8ea5..d2911d2 100644
--- a/voltha-northbound-bbf-adapter/templates/netopeer2-svc.yaml
+++ b/voltha-northbound-bbf-adapter/templates/netopeer2-svc.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-northbound-bbf-adapter/values.yaml b/voltha-northbound-bbf-adapter/values.yaml
index 39a142a..7f6792a 100644
--- a/voltha-northbound-bbf-adapter/values.yaml
+++ b/voltha-northbound-bbf-adapter/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/Chart.yaml b/voltha/Chart.yaml
index 55f322c..8061e8e 100644
--- a/voltha/Chart.yaml
+++ b/voltha/Chart.yaml
@@ -14,7 +14,7 @@
 ---
 apiVersion: "v1"
 name: "voltha"
-version: "2.11.4"
+version: "2.11.5-dev1"
 description: "A Helm chart for Voltha based on K8S resources in Voltha project"
 keywords:
   - "onf"