diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/policy/AddPolicyDeviceImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/policy/AddPolicyDeviceImpl.java
index 1d6302a28f5a0e869769c2ce0fcb80404b838ea5..4795273c6659c3cf7a79d8bb43cc7af0f2ed3ea3 100644
--- a/src/policy/src/main/java/org/etsi/tfs/policy/policy/AddPolicyDeviceImpl.java
+++ b/src/policy/src/main/java/org/etsi/tfs/policy/policy/AddPolicyDeviceImpl.java
@@ -1,3 +1,19 @@
+/*
+* 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
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package org.etsi.tfs.policy.policy;
 
 import static org.etsi.tfs.policy.common.ApplicationProperties.INVALID_MESSAGE;
diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/policy/AddPolicyServiceImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/policy/AddPolicyServiceImpl.java
index 0ee7ba3ee2b50c6e839683bbe1706da1e7504390..5932a64128b109b7f7e908590294d0b0db3b03d8 100644
--- a/src/policy/src/main/java/org/etsi/tfs/policy/policy/AddPolicyServiceImpl.java
+++ b/src/policy/src/main/java/org/etsi/tfs/policy/policy/AddPolicyServiceImpl.java
@@ -1,3 +1,19 @@
+/*
+* 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
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package org.etsi.tfs.policy.policy;
 
 import static org.etsi.tfs.policy.common.ApplicationProperties.INVALID_MESSAGE;
diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonAlarmService.java b/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonAlarmService.java
index a5bb7df216bdd5b005972341b84b0d3bb34a6cd5..3cfe6491ebf6e0d5e8b7fa3b5f66f13e6d1c0631 100644
--- a/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonAlarmService.java
+++ b/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonAlarmService.java
@@ -1,3 +1,19 @@
+/*
+* 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
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package org.etsi.tfs.policy.policy;
 
 import static org.etsi.tfs.policy.common.ApplicationProperties.PROVISIONED_POLICYRULE_STATE;
diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonPolicyServiceImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonPolicyServiceImpl.java
index 263619f812b8a57c4761d42c6eac4a1edaf820f0..5ebceba17bea15ee3f1609b2681acbb65e2d08fe 100644
--- a/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonPolicyServiceImpl.java
+++ b/src/policy/src/main/java/org/etsi/tfs/policy/policy/CommonPolicyServiceImpl.java
@@ -1,3 +1,19 @@
+/*
+* 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
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
 package org.etsi.tfs.policy.policy;
 
 import static org.etsi.tfs.policy.common.ApplicationProperties.ACTIVE_POLICYRULE_STATE;
diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/policy/DeletePolicyImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/policy/DeletePolicyImpl.java
deleted file mode 100644
index d78d00b8340fdaf09076aa06a86428af33109c5d..0000000000000000000000000000000000000000
--- a/src/policy/src/main/java/org/etsi/tfs/policy/policy/DeletePolicyImpl.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package org.etsi.tfs.policy.policy;
-
-public class DeletePolicyImpl {}
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index f193446275508d6ee662be3ae7d488c324f63447..4f581f0c9225dd8772dd476b133ba04880683851 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -3,8 +3,8 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.quarkus.io/commit-id: 5979d9847bc4313fb93ef1e50de27685d526cd7b
-    app.quarkus.io/build-timestamp: 2024-04-04 - 14:47:27 +0000
+    app.quarkus.io/commit-id: 182b55a46135040b71a5980de9f72d94a85db2e8
+    app.quarkus.io/build-timestamp: 2024-04-08 - 08:15:43 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8080"
@@ -37,8 +37,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.quarkus.io/commit-id: 5979d9847bc4313fb93ef1e50de27685d526cd7b
-    app.quarkus.io/build-timestamp: 2024-04-04 - 14:47:27 +0000
+    app.quarkus.io/commit-id: 182b55a46135040b71a5980de9f72d94a85db2e8
+    app.quarkus.io/build-timestamp: 2024-04-08 - 08:15:43 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8080"
@@ -46,8 +46,8 @@ metadata:
   labels:
     app: policyservice
     app.kubernetes.io/managed-by: quarkus
-    app.kubernetes.io/version: 0.1.0
     app.kubernetes.io/name: policyservice
+    app.kubernetes.io/version: 0.1.0
   name: policyservice
 spec:
   replicas: 1
@@ -57,8 +57,8 @@ spec:
   template:
     metadata:
       annotations:
-        app.quarkus.io/commit-id: 5979d9847bc4313fb93ef1e50de27685d526cd7b
-        app.quarkus.io/build-timestamp: 2024-04-04 - 14:47:27 +0000
+        app.quarkus.io/commit-id: 182b55a46135040b71a5980de9f72d94a85db2e8
+        app.quarkus.io/build-timestamp: 2024-04-08 - 08:15:43 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8080"
@@ -66,8 +66,8 @@ spec:
       labels:
         app: policyservice
         app.kubernetes.io/managed-by: quarkus
-        app.kubernetes.io/version: 0.1.0
         app.kubernetes.io/name: policyservice
+        app.kubernetes.io/version: 0.1.0
     spec:
       containers:
         - env: