diff --git a/VERSION b/VERSION
index 34728b5..9462efa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.11.7
+2.11.8
diff --git a/scripts/mem_consumption.py b/scripts/mem_consumption.py
index 199d9b2..7b42542 100644
--- a/scripts/mem_consumption.py
+++ b/scripts/mem_consumption.py
@@ -65,3 +65,5 @@
 
     args = parser.parse_args()
     main(args.address, args.output, args.namespace)
+
+# [EOF]
diff --git a/tests/bbsim/Voltha_BBSimTests.robot b/tests/bbsim/Voltha_BBSimTests.robot
index cc420ca..44dbdcd 100755
--- a/tests/bbsim/Voltha_BBSimTests.robot
+++ b/tests/bbsim/Voltha_BBSimTests.robot
@@ -1,4 +1,4 @@
-# Copyright 2020 - present Open Networking Foundation
+# Copyright 2020-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml b/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml
index cd5ac38..2d36404 100755
--- a/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml
+++ b/tests/data/bbsim-kind-multi-uni-2OLTx2ONUx2PON.yaml
@@ -1,6 +1,6 @@
 ---
 
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index c484a48..ddc687e 100755
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -1,4 +1,4 @@
-# Copyright 2017 - present Open Networking Foundation
+# Copyright 2017-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/openonu-go-adapter/Voltha_ONUOmciGetTest.robot b/tests/openonu-go-adapter/Voltha_ONUOmciGetTest.robot
index 69ad4b4..9484985 100755
--- a/tests/openonu-go-adapter/Voltha_ONUOmciGetTest.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUOmciGetTest.robot
@@ -1,4 +1,4 @@
-# Copyright 2021 - present Open Networking Foundation
+# Copyright 2021-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/variables/variables.py b/variables/variables.py
index b827f14..5f946f1 100755
--- a/variables/variables.py
+++ b/variables/variables.py
@@ -1,4 +1,4 @@
-# Copyright 2020 Open Networking Foundation
+# Copyright 2020-2022 Open Networking Foundation (ONF) and the ONF Contributors
 # delivered by ADTRAN, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,4 +24,3 @@
         'example_variable': 'this is an example, how add a (dynamic) variable to robotframework'
     }
     return variables
-    
\ No newline at end of file
diff --git a/variables/variables.robot b/variables/variables.robot
index 6e82260..be1aafe 100644
--- a/variables/variables.robot
+++ b/variables/variables.robot
@@ -1,4 +1,4 @@
-# Copyright 2017-present Open Networking Foundation
+# Copyright 2017-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.