diff --git a/src/policy/.gitlab-ci.yml b/src/policy/.gitlab-ci.yml
index 164540a05172666375f503549f098ef3a90cdf06..a8ae7fc154ad91a62278c88c50e505e29ce25620 100644
--- a/src/policy/.gitlab-ci.yml
+++ b/src/policy/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java b/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java
index ab03189d3266dd4eb2286c4f8212fa7a06425d4d..a1556ffbd715e0065681dcfa6001dd041ff89ef0 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/main/java/eu/teraflow/policy/Serializer.java b/src/policy/src/main/java/eu/teraflow/policy/Serializer.java
index bc2b9b3cb5f3d4c7f47c467e3d09bbb61915629b..9cfeaeaf4e0afa6d38da148d8a5c467ff23f0863 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/Serializer.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/Serializer.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java b/src/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java
index bee4157d08ada23e738282e5f7732c1db99a9dee..ec0859cb73fca89ec8c0b0d2651f5752baa8c590 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java b/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java
index 02550446d691ca2d07bf9192943ba473e1a954b1..bd2487fe5f7f33f7d94279ecbfcd96cb8fc11a9b 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java b/src/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java
index 1bedde35212383e42c7fabfe832d4bd4df34e99b..38257967703bee1d49ae8b1fc7ef11906690b1aa 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java b/src/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java
index faaa49c3488cfa7e81f696637a8a7a4393d8f824..2a32fc076853057f547df9d38abbba08611c21a0 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java b/src/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java
index 6389a359974c0accf6b248de5a43367a553c13d9..9dc97b4a1269580a93e58f495d28c0f8d81c1c31 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java b/src/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java
index 4c113dc95fda5160959505bfc90c02c4bd39acf7..72501b3c6fc010a928a30edc5cad002deb38f440 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java b/src/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java
index d89d62c63486cf571f2606786b805abdc066204c..cc4813c76f02a23e6662cf2593680dc8f3b39962 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java
index d73a5ad37e64ee241f43cb094743847153fa2f8a..6e0f220535a239be4b98c895fd70efa4d05758b0 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java
index 635876dcba59eef27273ff2bc24a7921991e2975..fb7cb38abdaa383986215d9692129086332e1a48 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java
index e2687945a0f091a987af5899bbf8e53327a41e28..aaaea41f8f292b409328e2e95e8797f9f250f47f 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java
index ba0fd174dbce9c14eb4d7ea9c71128ce22ecfec6..057906d6528a165bdd9c958e8339ac8f5d59cc25 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java b/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java
index e94e0a29421643298fe41b0d6fdc121fe5be71e2..d50b7837ad31c88296af74b260321ac1d86b1256 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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/policy/src/test/java/eu/teraflow/policy/SerializerTest.java b/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java
index 7e6967e0c22c2aa4b88d4b8a77c87f20023d3c2a..df4868f1d4cc7b151c935f554ad62e8e75f7174e 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java
@@ -1,10 +1,10 @@
 /*
-* Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+* Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.
 * You may obtain a copy of the License at
-*provideKpiValueRanges
+*
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
diff --git a/src/policy/util/set_version.sh b/src/policy/util/set_version.sh
index 0d73a243ea9cf6eeaa77601de6eff54c09ee40a2..d0b5a26c99d4245183def711eef918f26d42be53 100755
--- a/src/policy/util/set_version.sh
+++ b/src/policy/util/set_version.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.