diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index f7afd58..0be750d 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -1,4 +1,4 @@
-# Copyright 2018 the original author or authors.
+# Copyright 2018-2022 Open Networking Foundation (ONF) and the ONF Contributors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/Makefile b/Makefile
index 72c2c92..418688a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright 2016 the original author or authors.
+# Copyright 2016-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.
@@ -55,7 +55,7 @@
 local-onosapps: ## if LOCAL_ONOSAPPS=true runs the get-local-oars.sh
 	mkdir -p local_imports/oar
 ifdef LOCAL_ONOSAPPS
-	rm -rf local_imports/oar
+	$(RM) -r local_imports/oar
 	./get-local-oars.sh
 endif
 
@@ -77,6 +77,6 @@
 	docker push ${ONOS_IMAGENAME}
 
 clean: ## clean the build environment
-	rm -rf local_imports
+	$(RM) -r local_imports
 
 # end file
diff --git a/app-install.sh b/app-install.sh
index 5ca794e..4710c8d 100755
--- a/app-install.sh
+++ b/app-install.sh
@@ -1,5 +1,5 @@
-#!/bin/bash 
-# Copyright 2017-present Open Networking Foundation
+#!/bin/bash
+# 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/dependencies.xml b/dependencies.xml
index b019908..49a8b3c 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ 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/get-local-oars.sh b/get-local-oars.sh
index ae8e6d9..0da28ae 100755
--- a/get-local-oars.sh
+++ b/get-local-oars.sh
@@ -1,5 +1,6 @@
+#!/bin/bash
 #
-# Copyright 2016 the original author or authors.
+# 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/mvn_settings.sh b/mvn_settings.sh
index 7f66f25..d044826 100755
--- a/mvn_settings.sh
+++ b/mvn_settings.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# 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/version-check.sh b/tests/version-check.sh
index 65ad4d6..197b15a 100644
--- a/tests/version-check.sh
+++ b/tests/version-check.sh
@@ -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.