diff --git a/manifests/vnt_managerservice.yaml b/manifests/vnt_managerservice.yaml
index 277895db28892b3bf4ea6ffd7c4515f9daf986f4..2e31c743902da3dd6ab9354f5b7617d4e884751e 100644
--- a/manifests/vnt_managerservice.yaml
+++ b/manifests/vnt_managerservice.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/proto/vnt_manager.proto b/proto/vnt_manager.proto
index ce7cf610221b87256e10eb47c56772beb343d458..1e1d67e122fa0cbb7088b366c5001a712a38a1f0 100644
--- a/proto/vnt_manager.proto
+++ b/proto/vnt_manager.proto
@@ -1,4 +1,4 @@
-// Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+// Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 //
 // 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/scripts/show_logs_vntmanager.sh b/scripts/show_logs_vntmanager.sh
index e39cb35c5d33be012634a890836917b33206aa8d..0dba86567bd5118b685c72fd17b1904acfe698cc 100755
--- a/scripts/show_logs_vntmanager.sh
+++ b/scripts/show_logs_vntmanager.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/scripts/update_license_headers.py b/scripts/update_license_headers.py
index 1de9f9b7c2795505aba53276a0deb2acdcccc703..34d620ed8bc1a0817509916c2d1f857979cdd431 100644
--- a/scripts/update_license_headers.py
+++ b/scripts/update_license_headers.py
@@ -32,6 +32,7 @@ STR_NEW_COPYRIGHT = 'Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https:/
 RE_OLD_COPYRIGHTS = [
     r'Copyright\ 2021\-2023\ H2020\ TeraFlow\ \(https\:\/\/www\.teraflow\-h2020\.eu\/\)',
     r'Copyright\ 2022\-2023\ ETSI\ TeraFlowSDN\ \-\ TFS\ OSG\ \(https\:\/\/tfs\.etsi\.org\/\)',
+    r'Copyright\ 2022\-2024\ ETSI\ TeraFlowSDN\ \-\ TFS\ OSG\ \(https\:\/\/tfs\.etsi\.org\/\)',
 ]
 RE_OLD_COPYRIGHTS = [
     (re.compile(r'.*{}.*'.format(re_old_copyright)), re.compile(re_old_copyright))
diff --git a/src/nbi/service/context_subscription/__init__.py b/src/nbi/service/context_subscription/__init__.py
index e0dd90005c99350fc0571616f7f12d3d0a8d1016..f0d8d7d4229b30d05a1c960d32fb337653be3706 100644
--- a/src/nbi/service/context_subscription/__init__.py
+++ b/src/nbi/service/context_subscription/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/__init__.py b/src/tests/ecoc24/__init__.py
index a5ccb6078c2c18285753cacb045f9614017f8485..3ee6f7071f145e06c3aeaefc09a43ccd88e619e3 100644
--- a/src/tests/ecoc24/__init__.py
+++ b/src/tests/ecoc24/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/deploy_e2e.sh b/src/tests/ecoc24/deploy_e2e.sh
index dbea63e434358aa2cbfe6f891a20050561a4d62a..23ff8b7f037b8f2497e6ef851c3aa9f301772e1a 100755
--- a/src/tests/ecoc24/deploy_e2e.sh
+++ b/src/tests/ecoc24/deploy_e2e.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/deploy_ip.sh b/src/tests/ecoc24/deploy_ip.sh
index 222c142f0290ed696b5ed25bb037d0aef68bfbb5..a6c5e82557d02c89f67bbbf0ee0a6f88650ba9d1 100755
--- a/src/tests/ecoc24/deploy_ip.sh
+++ b/src/tests/ecoc24/deploy_ip.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/deploy_opt.sh b/src/tests/ecoc24/deploy_opt.sh
index e90fab0e27d841133a0366007a8991de2162dbda..3a9523768ec21c2e177a3567a51cdc94f4db992b 100755
--- a/src/tests/ecoc24/deploy_opt.sh
+++ b/src/tests/ecoc24/deploy_opt.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/dump_logs.sh b/src/tests/ecoc24/dump_logs.sh
index 0d8d517f1af5fe45b6cc8df8e6bffdc5e8752db9..bb9a35d126a94812d4157d2ba5b4725acbde4caf 100755
--- a/src/tests/ecoc24/dump_logs.sh
+++ b/src/tests/ecoc24/dump_logs.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/nginx-ingress-controller-e2e.yaml b/src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
index c4fc966d13fef5f0cf38dff1fb3bc86942d4687a..b5f2447aab2ad557e1dc56cdb86a61962494f67d 100644
--- a/src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
+++ b/src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/nginx-ingress-controller-ip.yaml b/src/tests/ecoc24/nginx-ingress-controller-ip.yaml
index f8946a8a33a79bae0fd8587c2f3eff1b00028b9b..4735ae264a27e6f691d2900701afdd2b0ef2e3d4 100644
--- a/src/tests/ecoc24/nginx-ingress-controller-ip.yaml
+++ b/src/tests/ecoc24/nginx-ingress-controller-ip.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/nginx-ingress-controller-opt.yaml b/src/tests/ecoc24/nginx-ingress-controller-opt.yaml
index 9793b00cbb32ad59b4ef320f2435d69e0f12eac1..d62898b60bed4f16999ff71f3c6173fd5d334e12 100644
--- a/src/tests/ecoc24/nginx-ingress-controller-opt.yaml
+++ b/src/tests/ecoc24/nginx-ingress-controller-opt.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/show_deploy.sh b/src/tests/ecoc24/show_deploy.sh
index 84c887bf4420358e7aa84c61654e8188c6660063..295dd29b4d132c6f809a01e5dc2cb17a956531a2 100755
--- a/src/tests/ecoc24/show_deploy.sh
+++ b/src/tests/ecoc24/show_deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/subscription_ws_e2e.sh b/src/tests/ecoc24/subscription_ws_e2e.sh
index 52a687f6f162f8d3bcce1f7d92ebfc53f3d41951..33f5a5109044b1aa7384da41965d1b84a29cb945 100755
--- a/src/tests/ecoc24/subscription_ws_e2e.sh
+++ b/src/tests/ecoc24/subscription_ws_e2e.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/tests/ecoc24/subscription_ws_ip.sh b/src/tests/ecoc24/subscription_ws_ip.sh
index 69239b2576f14ebea418e8d6834ad0946b0bc0cf..795469e8fcb026cd1734a6330fc7b8c4a1e97aac 100755
--- a/src/tests/ecoc24/subscription_ws_ip.sh
+++ b/src/tests/ecoc24/subscription_ws_ip.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/.gitlab-ci.yml b/src/vnt_manager/.gitlab-ci.yml
index 85192054ede48cefa74ff2ebca4b4ce3aa61aa14..b338f97ac8a517abbfbdc5112bd54d5d6545afd1 100644
--- a/src/vnt_manager/.gitlab-ci.yml
+++ b/src/vnt_manager/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/Config.py b/src/vnt_manager/Config.py
index 719815a4233422a18cc00318739b6b5af32b6ebc..bbfc943b68af13a11e562abbc8680ade71db8f02 100644
--- a/src/vnt_manager/Config.py
+++ b/src/vnt_manager/Config.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/Dockerfile b/src/vnt_manager/Dockerfile
index 53d9393bd4ce65e3da31f8ae7ddcaf2ba402d21b..93549aa8a4bd6d89945861e8be13a7e4352c0840 100644
--- a/src/vnt_manager/Dockerfile
+++ b/src/vnt_manager/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/__init__.py b/src/vnt_manager/__init__.py
index 719815a4233422a18cc00318739b6b5af32b6ebc..bbfc943b68af13a11e562abbc8680ade71db8f02 100644
--- a/src/vnt_manager/__init__.py
+++ b/src/vnt_manager/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/client/VNTManagerClient.py b/src/vnt_manager/client/VNTManagerClient.py
index 74ef741bfc442e478cd68f9b1657bc8aa42d9fad..8ecb3dc0d8f7c937c66b5af6e2f3ae715575b425 100644
--- a/src/vnt_manager/client/VNTManagerClient.py
+++ b/src/vnt_manager/client/VNTManagerClient.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/client/__init__.py b/src/vnt_manager/client/__init__.py
index 719815a4233422a18cc00318739b6b5af32b6ebc..bbfc943b68af13a11e562abbc8680ade71db8f02 100644
--- a/src/vnt_manager/client/__init__.py
+++ b/src/vnt_manager/client/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/requirements.in b/src/vnt_manager/requirements.in
index ba3b221be1e196632173a49c053755d6cb7b5d4c..5732b1bf053301f73a37830e66eb211912d9e200 100644
--- a/src/vnt_manager/requirements.in
+++ b/src/vnt_manager/requirements.in
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/service/VNTManagerService.py b/src/vnt_manager/service/VNTManagerService.py
index d42e270f9644292594ea7049312e8e7a32a47353..80d635ffe475c7840cf9bd0c0650471bae17cb3e 100644
--- a/src/vnt_manager/service/VNTManagerService.py
+++ b/src/vnt_manager/service/VNTManagerService.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/service/VNTManagerServiceServicerImpl.py b/src/vnt_manager/service/VNTManagerServiceServicerImpl.py
index 3640011476a76930f69c590cb6897a9009a4c37d..4e7230b3ce59c2c6d7e2849179e95e12f2df6d2b 100644
--- a/src/vnt_manager/service/VNTManagerServiceServicerImpl.py
+++ b/src/vnt_manager/service/VNTManagerServiceServicerImpl.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/service/__init__.py b/src/vnt_manager/service/__init__.py
index 719815a4233422a18cc00318739b6b5af32b6ebc..bbfc943b68af13a11e562abbc8680ade71db8f02 100644
--- a/src/vnt_manager/service/__init__.py
+++ b/src/vnt_manager/service/__init__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # 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/src/vnt_manager/service/__main__.py b/src/vnt_manager/service/__main__.py
index 40918ecce622ae31bedfb9924976dc36c17f8c98..9e9bea3de9836e3b03b3ffc14d6fdee560fa1593 100644
--- a/src/vnt_manager/service/__main__.py
+++ b/src/vnt_manager/service/__main__.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.