diff --git a/deployment-configs/adtran-munich.yaml b/deployment-configs/adtran-munich.yaml
index f714611..3fc0eff 100644
--- a/deployment-configs/adtran-munich.yaml
+++ b/deployment-configs/adtran-munich.yaml
@@ -1,4 +1,4 @@
-# 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/deployment-configs/berlin-community-pod-1-gpon-TT.yaml b/deployment-configs/berlin-community-pod-1-gpon-TT.yaml
index 93bcfbb..b54ae4d 100644
--- a/deployment-configs/berlin-community-pod-1-gpon-TT.yaml
+++ b/deployment-configs/berlin-community-pod-1-gpon-TT.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/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml b/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
index 7628079..aa745af 100644
--- a/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-multi-olt-DT.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/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml b/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml
index 18e7df4..b293711 100644
--- a/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml
+++ b/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.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/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
index 0e22bc8..43bdb3d 100644
--- a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
+++ b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.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/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
index 84c5616..1e8499c 100644
--- a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
+++ b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
@@ -1,4 +1,4 @@
-# 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/deployment-configs/flex-ocp-cord-TT.yaml b/deployment-configs/flex-ocp-cord-TT.yaml
index 31caa38..8a9ff3f 100644
--- a/deployment-configs/flex-ocp-cord-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-TT.yaml
@@ -1,4 +1,4 @@
-# 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/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index 8c3bcbc..e400e52 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -1,4 +1,4 @@
-# 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/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
index 366850c..3cbea9d 100644
--- a/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.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/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
index 4c9334b..40a1907 100644
--- a/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-1600x-DT.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/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
index 33e07a5..90ce79d 100644
--- a/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.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/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index b8ea531..a800b3d 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -1,4 +1,4 @@
-# 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/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
index 1b4c2ed..1c33579 100644
--- a/deployment-configs/onf-demo-pod-gpon-DT.yaml
+++ b/deployment-configs/onf-demo-pod-gpon-DT.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/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 87ffb58..c602390 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -1,4 +1,4 @@
-# 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/deployment-configs/onf-soak-pod-DT.yaml b/deployment-configs/onf-soak-pod-DT.yaml
index 7ea4f8f..177f175 100644
--- a/deployment-configs/onf-soak-pod-DT.yaml
+++ b/deployment-configs/onf-soak-pod-DT.yaml
@@ -1,4 +1,4 @@
-# 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/deployment-configs/onf-soak-pod-openonugo.yaml b/deployment-configs/onf-soak-pod-openonugo.yaml
index 1803435..3246139 100644
--- a/deployment-configs/onf-soak-pod-openonugo.yaml
+++ b/deployment-configs/onf-soak-pod-openonugo.yaml
@@ -1,4 +1,4 @@
-# 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/deployment-configs/tucson-pod-DT.yaml b/deployment-configs/tucson-pod-DT.yaml
index eb3ce6c..8377edf 100644
--- a/deployment-configs/tucson-pod-DT.yaml
+++ b/deployment-configs/tucson-pod-DT.yaml
@@ -1,6 +1,6 @@
 ---
 
-# 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/deployment-configs/tucson-pod.yaml b/deployment-configs/tucson-pod.yaml
index ef3f287..e270b95 100644
--- a/deployment-configs/tucson-pod.yaml
+++ b/deployment-configs/tucson-pod.yaml
@@ -1,6 +1,6 @@
 ---
 
-# 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/kubernetes-configs/bbsim-voltha-1.6.yml b/kubernetes-configs/bbsim-voltha-1.6.yml
index 09dd55b..eb40f99 100644
--- a/kubernetes-configs/bbsim-voltha-1.6.yml
+++ b/kubernetes-configs/bbsim-voltha-1.6.yml
@@ -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/kubernetes-configs/bbsim-voltha-1.7.yml b/kubernetes-configs/bbsim-voltha-1.7.yml
index 1c702d4..6a66034 100644
--- a/kubernetes-configs/bbsim-voltha-1.7.yml
+++ b/kubernetes-configs/bbsim-voltha-1.7.yml
@@ -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/kubernetes-configs/flex-ocp-cord-voltha-master.yml b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
index ceb1253..8f76d7d 100644
--- a/kubernetes-configs/flex-ocp-cord-voltha-master.yml
+++ b/kubernetes-configs/flex-ocp-cord-voltha-master.yml
@@ -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/kubernetes-configs/flex-ocp-cord-voltha16.yml b/kubernetes-configs/flex-ocp-cord-voltha16.yml
index eb81693..ff2254c 100644
--- a/kubernetes-configs/flex-ocp-cord-voltha16.yml
+++ b/kubernetes-configs/flex-ocp-cord-voltha16.yml
@@ -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/kubernetes-configs/onf-demo-pod.yml b/kubernetes-configs/onf-demo-pod.yml
index 7a2168c..b7440a9 100644
--- a/kubernetes-configs/onf-demo-pod.yml
+++ b/kubernetes-configs/onf-demo-pod.yml
@@ -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/kubernetes-configs/onf-p4-demo-pod.yml b/kubernetes-configs/onf-p4-demo-pod.yml
index 327eca3..9549803 100644
--- a/kubernetes-configs/onf-p4-demo-pod.yml
+++ b/kubernetes-configs/onf-p4-demo-pod.yml
@@ -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/kubernetes-configs/onf-soak-pod.yml b/kubernetes-configs/onf-soak-pod.yml
index 7a2168c..b7440a9 100644
--- a/kubernetes-configs/onf-soak-pod.yml
+++ b/kubernetes-configs/onf-soak-pod.yml
@@ -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/kubernetes-configs/onlab-pod1-qa.yml b/kubernetes-configs/onlab-pod1-qa.yml
index 1bbb4b9..b9503e4 100644
--- a/kubernetes-configs/onlab-pod1-qa.yml
+++ b/kubernetes-configs/onlab-pod1-qa.yml
@@ -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/kubernetes-configs/qct-pod1.yml b/kubernetes-configs/qct-pod1.yml
index d843a7c..839de5f 100644
--- a/kubernetes-configs/qct-pod1.yml
+++ b/kubernetes-configs/qct-pod1.yml
@@ -1,4 +1,4 @@
-# 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/kubernetes-configs/voltha/onf-soak-pod.yml b/kubernetes-configs/voltha/onf-soak-pod.yml
index 9b5ce05..1c394d5 100644
--- a/kubernetes-configs/voltha/onf-soak-pod.yml
+++ b/kubernetes-configs/voltha/onf-soak-pod.yml
@@ -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/makefiles/consts.mk b/makefiles/consts.mk
index c96cb88..007d677 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/lint/license/include.mk b/makefiles/lint/license/include.mk
index aaf6e47..538a415 100644
--- a/makefiles/lint/license/include.mk
+++ b/makefiles/lint/license/include.mk
@@ -1,6 +1,6 @@
 # -*- makefile -*-
 # -----------------------------------------------------------------------
-# Copyright 2022 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/makefiles/lint/license/license-check.sh b/makefiles/lint/license/license-check.sh
index 10d3376..bbf560e 100755
--- a/makefiles/lint/license/license-check.sh
+++ b/makefiles/lint/license/license-check.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # -----------------------------------------------------------------------
-# Copyright 2022 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/makefiles/lint/license/license-helper.sh b/makefiles/lint/license/license-helper.sh
index 499f854..0f690e4 100755
--- a/makefiles/lint/license/license-helper.sh
+++ b/makefiles/lint/license/license-helper.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # -----------------------------------------------------------------------
-# Copyright 2022 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/tosca-configs/aether/aether-production-fabric.yaml b/tosca-configs/aether/aether-production-fabric.yaml
index 7df7441..3d797d2 100644
--- a/tosca-configs/aether/aether-production-fabric.yaml
+++ b/tosca-configs/aether/aether-production-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/adtran-munich-olt.yaml b/tosca-configs/att-workflow/adtran-munich-olt.yaml
index a51ff5a..0c2bfa4 100644
--- a/tosca-configs/att-workflow/adtran-munich-olt.yaml
+++ b/tosca-configs/att-workflow/adtran-munich-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/adtran-munich-subscriber.yaml b/tosca-configs/att-workflow/adtran-munich-subscriber.yaml
index 83d5a34..87e0a1c 100644
--- a/tosca-configs/att-workflow/adtran-munich-subscriber.yaml
+++ b/tosca-configs/att-workflow/adtran-munich-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/bbwf-edgecore-olt.yaml b/tosca-configs/att-workflow/bbwf-edgecore-olt.yaml
index cc0d83b..52fde46 100755
--- a/tosca-configs/att-workflow/bbwf-edgecore-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-edgecore-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index e77f4a1..e1a69e8 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/bbwf-iskt-gpon-olt.yaml b/tosca-configs/att-workflow/bbwf-iskt-gpon-olt.yaml
index 93d7e5a..f07ceee 100755
--- a/tosca-configs/att-workflow/bbwf-iskt-gpon-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-iskt-gpon-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/bbwf-iskt-xgspon-olt.yaml b/tosca-configs/att-workflow/bbwf-iskt-xgspon-olt.yaml
index d1176fd..ee1e455 100755
--- a/tosca-configs/att-workflow/bbwf-iskt-xgspon-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-iskt-xgspon-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/bbwf-subscriber.yaml b/tosca-configs/att-workflow/bbwf-subscriber.yaml
index a47e627..743f1a0 100755
--- a/tosca-configs/att-workflow/bbwf-subscriber.yaml
+++ b/tosca-configs/att-workflow/bbwf-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
index 32505d3..5e8b38a 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/edgecore-pod1-olt.yaml b/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
index 6db62e5..c652d97 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
index fedcbd1..a1fad9a 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-ocp-cord-fabric.yaml b/tosca-configs/att-workflow/flex-ocp-cord-fabric.yaml
index af051bd..99f8d89 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-fabric.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-ocp-cord-olt.yaml b/tosca-configs/att-workflow/flex-ocp-cord-olt.yaml
index 8372eff..3c1b25f 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-olt.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-ocp-cord-subscriber.yaml b/tosca-configs/att-workflow/flex-ocp-cord-subscriber.yaml
index ac9eb6d..9417249 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-subscriber.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-fabric.yaml b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-fabric.yaml
index af051bd..99f8d89 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-fabric.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-olt.yaml b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-olt.yaml
index 8372eff..3c1b25f 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-olt.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-subscriber.yaml b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-subscriber.yaml
index ac9eb6d..9417249 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-subscriber.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-voltha-master-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-ocp-cord-voltha16-fabric.yaml b/tosca-configs/att-workflow/flex-ocp-cord-voltha16-fabric.yaml
index dd1d59e..333c4ec 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-voltha16-fabric.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-voltha16-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-ocp-cord-voltha16-olt.yaml b/tosca-configs/att-workflow/flex-ocp-cord-voltha16-olt.yaml
index 96f1415..f8fb802 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-voltha16-olt.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-voltha16-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-ocp-cord-voltha16-subscriber.yaml b/tosca-configs/att-workflow/flex-ocp-cord-voltha16-subscriber.yaml
index ade7eed..3115df5 100755
--- a/tosca-configs/att-workflow/flex-ocp-cord-voltha16-subscriber.yaml
+++ b/tosca-configs/att-workflow/flex-ocp-cord-voltha16-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-pod1-olt-fabric.yaml b/tosca-configs/att-workflow/flex-pod1-olt-fabric.yaml
index 3064223..ee488d8 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-fabric.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml b/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml
index a00311b..5b50094 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-pod1-olt-subscriber.yaml b/tosca-configs/att-workflow/flex-pod1-olt-subscriber.yaml
index 4914bfd..b1b6159 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-subscriber.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-fabric.yaml b/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-fabric.yaml
index 3064223..ee488d8 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-fabric.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-olt.yaml b/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-olt.yaml
index a00311b..5b50094 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-olt.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-subscriber.yaml b/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-subscriber.yaml
index 4914bfd..b1b6159 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-subscriber.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-voltha-master-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-pod1-olt-voltha16-fabric.yaml b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-fabric.yaml
index 3064223..ee488d8 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-voltha16-fabric.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml
index a00311b..5b50094 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/flex-pod1-olt-voltha16-subscriber.yaml b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-subscriber.yaml
index 4914bfd..b1b6159 100755
--- a/tosca-configs/att-workflow/flex-pod1-olt-voltha16-subscriber.yaml
+++ b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/mcord-local-cluster-fabric.yaml b/tosca-configs/att-workflow/mcord-local-cluster-fabric.yaml
index b15ce5f..2cc7b75 100755
--- a/tosca-configs/att-workflow/mcord-local-cluster-fabric.yaml
+++ b/tosca-configs/att-workflow/mcord-local-cluster-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/mcord-local-cluster-olt.yaml b/tosca-configs/att-workflow/mcord-local-cluster-olt.yaml
index b05fcb2..5684d10 100755
--- a/tosca-configs/att-workflow/mcord-local-cluster-olt.yaml
+++ b/tosca-configs/att-workflow/mcord-local-cluster-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/mcord-local-cluster-subscriber.yaml b/tosca-configs/att-workflow/mcord-local-cluster-subscriber.yaml
index fbf0df8..c28aa20 100755
--- a/tosca-configs/att-workflow/mcord-local-cluster-subscriber.yaml
+++ b/tosca-configs/att-workflow/mcord-local-cluster-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml b/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
index 53a7d79..21d4d70 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onf-demo-pod-olt.yaml b/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
index e77dccb..3771395 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
index dfcc81a..d6ab697 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onf-mcord-pod1-fabric.yaml b/tosca-configs/att-workflow/onf-mcord-pod1-fabric.yaml
index 8f7cf4b..f286718 100755
--- a/tosca-configs/att-workflow/onf-mcord-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/onf-mcord-pod1-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml b/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml
index 94affc2..c800198 100755
--- a/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/onf-mcord-pod1-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onf-mcord-pod1-subscriber.yaml b/tosca-configs/att-workflow/onf-mcord-pod1-subscriber.yaml
index 2739d1a..3d15d72 100755
--- a/tosca-configs/att-workflow/onf-mcord-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/onf-mcord-pod1-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onf-p4-demo-pod-fabric.yaml b/tosca-configs/att-workflow/onf-p4-demo-pod-fabric.yaml
index d634bc2..e1c0702 100644
--- a/tosca-configs/att-workflow/onf-p4-demo-pod-fabric.yaml
+++ b/tosca-configs/att-workflow/onf-p4-demo-pod-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onf-p4-demo-pod-subscriber.yaml b/tosca-configs/att-workflow/onf-p4-demo-pod-subscriber.yaml
index c91c1cc..d4981b5 100644
--- a/tosca-configs/att-workflow/onf-p4-demo-pod-subscriber.yaml
+++ b/tosca-configs/att-workflow/onf-p4-demo-pod-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml b/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
index 2ab8a89..5ff00a2 100755
--- a/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml b/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
index a4f4868..cb44d92 100755
--- a/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod1-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
index a374730..8c846c4 100755
--- a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml
index 6ff081a..b7058a3 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
index d8fec1c..6b4fe64 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
index 74ee32c..00d929d 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
index 42aa807..c744a3f 100755
--- a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod1-voltha16-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-voltha16-fabric.yaml
index 0f9ddb0..1ee7e00 100755
--- a/tosca-configs/att-workflow/onlab-pod1-voltha16-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-voltha16-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod1-voltha16-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-voltha16-olt.yaml
index 6257dbf..e2caeea 100755
--- a/tosca-configs/att-workflow/onlab-pod1-voltha16-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-voltha16-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod1-voltha16-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-voltha16-subscriber.yaml
index 321f067..d111411 100755
--- a/tosca-configs/att-workflow/onlab-pod1-voltha16-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-voltha16-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod2-olt.yaml b/tosca-configs/att-workflow/onlab-pod2-olt.yaml
index 7167318..739c9e8 100755
--- a/tosca-configs/att-workflow/onlab-pod2-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml
index 6ec003e..b4ad367 100755
--- a/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/comac/edge-fabric-accelleran.yaml b/tosca-configs/comac/edge-fabric-accelleran.yaml
index 113c51b..18b4de4 100644
--- a/tosca-configs/comac/edge-fabric-accelleran.yaml
+++ b/tosca-configs/comac/edge-fabric-accelleran.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/tosca-configs/comac/progran.yaml b/tosca-configs/comac/progran.yaml
index 7a8db87..a4b367a 100644
--- a/tosca-configs/comac/progran.yaml
+++ b/tosca-configs/comac/progran.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/tosca-configs/mcord/mcord-local-cluster-fabric-accelleran.yaml b/tosca-configs/mcord/mcord-local-cluster-fabric-accelleran.yaml
index ae4c812..b3ba8b8 100644
--- a/tosca-configs/mcord/mcord-local-cluster-fabric-accelleran.yaml
+++ b/tosca-configs/mcord/mcord-local-cluster-fabric-accelleran.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/mcord/mcord-local-cluster-fabric-cavium.yaml b/tosca-configs/mcord/mcord-local-cluster-fabric-cavium.yaml
index 521baab..3f91045 100644
--- a/tosca-configs/mcord/mcord-local-cluster-fabric-cavium.yaml
+++ b/tosca-configs/mcord/mcord-local-cluster-fabric-cavium.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/mcord/mcord-local-cluster-fabric.yaml b/tosca-configs/mcord/mcord-local-cluster-fabric.yaml
index 84de26a..5ed124b 100644
--- a/tosca-configs/mcord/mcord-local-cluster-fabric.yaml
+++ b/tosca-configs/mcord/mcord-local-cluster-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/mcord/mcord-local-cluster-progran.yaml b/tosca-configs/mcord/mcord-local-cluster-progran.yaml
index 4a2e226..bb83caf 100644
--- a/tosca-configs/mcord/mcord-local-cluster-progran.yaml
+++ b/tosca-configs/mcord/mcord-local-cluster-progran.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/mcord/mcord-release-cluster-fabric-accelleran.yaml b/tosca-configs/mcord/mcord-release-cluster-fabric-accelleran.yaml
index ab78016..297f52c 100644
--- a/tosca-configs/mcord/mcord-release-cluster-fabric-accelleran.yaml
+++ b/tosca-configs/mcord/mcord-release-cluster-fabric-accelleran.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/mcord/mcord-release-cluster-fabric-cavium.yaml b/tosca-configs/mcord/mcord-release-cluster-fabric-cavium.yaml
index 9eb00ec..465b89d 100644
--- a/tosca-configs/mcord/mcord-release-cluster-fabric-cavium.yaml
+++ b/tosca-configs/mcord/mcord-release-cluster-fabric-cavium.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/mcord/mcord-release-cluster-fabric.yaml b/tosca-configs/mcord/mcord-release-cluster-fabric.yaml
index 59d1059..89fd59e 100644
--- a/tosca-configs/mcord/mcord-release-cluster-fabric.yaml
+++ b/tosca-configs/mcord/mcord-release-cluster-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/mcord/onf-demo-pod-fabric.yaml b/tosca-configs/mcord/onf-demo-pod-fabric.yaml
index 6aa4e32..0d69579 100644
--- a/tosca-configs/mcord/onf-demo-pod-fabric.yaml
+++ b/tosca-configs/mcord/onf-demo-pod-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/mcord/onf-mcord-pod1-fabric.yaml b/tosca-configs/mcord/onf-mcord-pod1-fabric.yaml
index 148f887..7024b4d 100644
--- a/tosca-configs/mcord/onf-mcord-pod1-fabric.yaml
+++ b/tosca-configs/mcord/onf-mcord-pod1-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/rcord-topdown/flex-pod1-olt-fabric.yaml b/tosca-configs/rcord-topdown/flex-pod1-olt-fabric.yaml
index 7fa0838..6a9f1d8 100755
--- a/tosca-configs/rcord-topdown/flex-pod1-olt-fabric.yaml
+++ b/tosca-configs/rcord-topdown/flex-pod1-olt-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml b/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml
index 19e8d27..b735bfa 100755
--- a/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml
+++ b/tosca-configs/rcord-topdown/flex-pod1-olt-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/rcord-zerotouch/flex-pod1-olt-fabric.yaml b/tosca-configs/rcord-zerotouch/flex-pod1-olt-fabric.yaml
index bffd43e..263da67 100755
--- a/tosca-configs/rcord-zerotouch/flex-pod1-olt-fabric.yaml
+++ b/tosca-configs/rcord-zerotouch/flex-pod1-olt-fabric.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml b/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml
index 19e8d27..b735bfa 100755
--- a/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml
+++ b/tosca-configs/rcord-zerotouch/flex-pod1-olt-olt.yaml
@@ -1,4 +1,4 @@
-# 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/tosca-configs/rcord-zerotouch/flex-pod1-olt-subscriber.yaml b/tosca-configs/rcord-zerotouch/flex-pod1-olt-subscriber.yaml
index 3d4b64e..5602b68 100755
--- a/tosca-configs/rcord-zerotouch/flex-pod1-olt-subscriber.yaml
+++ b/tosca-configs/rcord-zerotouch/flex-pod1-olt-subscriber.yaml
@@ -1,4 +1,4 @@
-# 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/use-cases/e-cord/onf/global-vnaas-service.yaml b/use-cases/e-cord/onf/global-vnaas-service.yaml
index 4637c6c..8667cca 100644
--- a/use-cases/e-cord/onf/global-vnaas-service.yaml
+++ b/use-cases/e-cord/onf/global-vnaas-service.yaml
@@ -1,6 +1,6 @@
 ---
 
-# 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.