diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java
index 63e96a4c61769fbb6a009acf208ef7b4c81200ad..72a1d7136c00d2bac93087d7f8b8f3b7626f9803 100644
--- a/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java
+++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java
@@ -24,5 +24,8 @@ public enum DeviceDriverEnum {
     IETF_NETWORK_TOPOLOGY,
     ONF_TR_532,
     XR,
-    IETF_L2VPN
+    IETF_L2VPN,
+    GNMI_OPENCONFIG,
+    FLEXSCALE,
+    IETF_ACTN
 }
diff --git a/src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java
index df2ae46cf718dfd0178c0e658a40972855e16879..63fb1ad7a72d74cf52148027f4fc0e0546b0b58e 100644
--- a/src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java
+++ b/src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java
@@ -3618,11 +3618,9 @@ class SerializerTest {
                         DeviceDriverEnum.GNMI_OPENCONFIG,
                         ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG),
                 Arguments.of(
-                        DeviceDriverEnum.FLEXSCALE,
-                        ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE),
+                        DeviceDriverEnum.FLEXSCALE, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE),
                 Arguments.of(
-                        DeviceDriverEnum.IETF_ACTN,
-                        ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN),
+                        DeviceDriverEnum.IETF_ACTN, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN),
                 Arguments.of(
                         DeviceDriverEnum.UNDEFINED, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_UNDEFINED));
     }
diff --git a/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java b/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
index a25798b884d9006f9c1b218c133634784f8bf392..d4873899b0113a7356c1c4d6bc2ea9aae2e8b4e5 100644
--- a/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
+++ b/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
@@ -185,6 +185,14 @@ public final class ContextOuterClass {
      * <code>DEVICEDRIVER_GNMI_OPENCONFIG = 8;</code>
      */
     DEVICEDRIVER_GNMI_OPENCONFIG(8),
+    /**
+     * <code>DEVICEDRIVER_FLEXSCALE = 9;</code>
+     */
+    DEVICEDRIVER_FLEXSCALE(9),
+    /**
+     * <code>DEVICEDRIVER_IETF_ACTN = 10;</code>
+     */
+    DEVICEDRIVER_IETF_ACTN(10),
     UNRECOGNIZED(-1),
     ;
 
@@ -228,6 +236,14 @@ public final class ContextOuterClass {
      * <code>DEVICEDRIVER_GNMI_OPENCONFIG = 8;</code>
      */
     public static final int DEVICEDRIVER_GNMI_OPENCONFIG_VALUE = 8;
+    /**
+     * <code>DEVICEDRIVER_FLEXSCALE = 9;</code>
+     */
+    public static final int DEVICEDRIVER_FLEXSCALE_VALUE = 9;
+    /**
+     * <code>DEVICEDRIVER_IETF_ACTN = 10;</code>
+     */
+    public static final int DEVICEDRIVER_IETF_ACTN_VALUE = 10;
 
 
     public final int getNumber() {
@@ -263,6 +279,8 @@ public final class ContextOuterClass {
         case 6: return DEVICEDRIVER_XR;
         case 7: return DEVICEDRIVER_IETF_L2VPN;
         case 8: return DEVICEDRIVER_GNMI_OPENCONFIG;
+        case 9: return DEVICEDRIVER_FLEXSCALE;
+        case 10: return DEVICEDRIVER_IETF_ACTN;
         default: return null;
       }
     }
@@ -461,6 +479,10 @@ public final class ContextOuterClass {
      * <code>SERVICETYPE_TE = 4;</code>
      */
     SERVICETYPE_TE(4),
+    /**
+     * <code>SERVICETYPE_E2E = 5;</code>
+     */
+    SERVICETYPE_E2E(5),
     UNRECOGNIZED(-1),
     ;
 
@@ -484,6 +506,10 @@ public final class ContextOuterClass {
      * <code>SERVICETYPE_TE = 4;</code>
      */
     public static final int SERVICETYPE_TE_VALUE = 4;
+    /**
+     * <code>SERVICETYPE_E2E = 5;</code>
+     */
+    public static final int SERVICETYPE_E2E_VALUE = 5;
 
 
     public final int getNumber() {
@@ -515,6 +541,7 @@ public final class ContextOuterClass {
         case 2: return SERVICETYPE_L2NM;
         case 3: return SERVICETYPE_TAPI_CONNECTIVITY_SERVICE;
         case 4: return SERVICETYPE_TE;
+        case 5: return SERVICETYPE_E2E;
         default: return null;
       }
     }
@@ -75826,114 +75853,116 @@ public final class ContextOuterClass {
       "\0132\022.context.ContextId\022\025\n\rauthenticated\030\002" +
       " \001(\010*j\n\rEventTypeEnum\022\027\n\023EVENTTYPE_UNDEF" +
       "INED\020\000\022\024\n\020EVENTTYPE_CREATE\020\001\022\024\n\020EVENTTYP" +
-      "E_UPDATE\020\002\022\024\n\020EVENTTYPE_REMOVE\020\003*\231\002\n\020Dev" +
+      "E_UPDATE\020\002\022\024\n\020EVENTTYPE_REMOVE\020\003*\321\002\n\020Dev" +
       "iceDriverEnum\022\032\n\026DEVICEDRIVER_UNDEFINED\020" +
       "\000\022\033\n\027DEVICEDRIVER_OPENCONFIG\020\001\022\036\n\032DEVICE" +
       "DRIVER_TRANSPORT_API\020\002\022\023\n\017DEVICEDRIVER_P" +
       "4\020\003\022&\n\"DEVICEDRIVER_IETF_NETWORK_TOPOLOG" +
       "Y\020\004\022\033\n\027DEVICEDRIVER_ONF_TR_532\020\005\022\023\n\017DEVI" +
       "CEDRIVER_XR\020\006\022\033\n\027DEVICEDRIVER_IETF_L2VPN" +
-      "\020\007\022 \n\034DEVICEDRIVER_GNMI_OPENCONFIG\020\010*\217\001\n" +
-      "\033DeviceOperationalStatusEnum\022%\n!DEVICEOP" +
-      "ERATIONALSTATUS_UNDEFINED\020\000\022$\n DEVICEOPE" +
-      "RATIONALSTATUS_DISABLED\020\001\022#\n\037DEVICEOPERA" +
-      "TIONALSTATUS_ENABLED\020\002*\225\001\n\017ServiceTypeEn" +
-      "um\022\027\n\023SERVICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETY" +
-      "PE_L3NM\020\001\022\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVI" +
-      "CETYPE_TAPI_CONNECTIVITY_SERVICE\020\003\022\022\n\016SE" +
-      "RVICETYPE_TE\020\004*\304\001\n\021ServiceStatusEnum\022\033\n\027" +
-      "SERVICESTATUS_UNDEFINED\020\000\022\031\n\025SERVICESTAT" +
-      "US_PLANNED\020\001\022\030\n\024SERVICESTATUS_ACTIVE\020\002\022\032" +
-      "\n\026SERVICESTATUS_UPDATING\020\003\022!\n\035SERVICESTA" +
-      "TUS_PENDING_REMOVAL\020\004\022\036\n\032SERVICESTATUS_S" +
-      "LA_VIOLATED\020\005*\251\001\n\017SliceStatusEnum\022\031\n\025SLI" +
-      "CESTATUS_UNDEFINED\020\000\022\027\n\023SLICESTATUS_PLAN" +
-      "NED\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026\n\022SLICESTAT" +
-      "US_ACTIVE\020\003\022\026\n\022SLICESTATUS_DEINIT\020\004\022\034\n\030S" +
-      "LICESTATUS_SLA_VIOLATED\020\005*]\n\020ConfigActio" +
-      "nEnum\022\032\n\026CONFIGACTION_UNDEFINED\020\000\022\024\n\020CON" +
-      "FIGACTION_SET\020\001\022\027\n\023CONFIGACTION_DELETE\020\002" +
-      "*m\n\024ConstraintActionEnum\022\036\n\032CONSTRAINTAC" +
-      "TION_UNDEFINED\020\000\022\030\n\024CONSTRAINTACTION_SET" +
-      "\020\001\022\033\n\027CONSTRAINTACTION_DELETE\020\002*\203\002\n\022Isol" +
-      "ationLevelEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYS" +
-      "ICAL_ISOLATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022" +
-      "\025\n\021PROCESS_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMOR" +
-      "Y_ISOLATION\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLAT" +
-      "ION\020\005\022\036\n\032VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n" +
-      "\033NETWORK_FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVIC" +
-      "E_ISOLATION\020\0102\245\026\n\016ContextService\022:\n\016List" +
-      "ContextIds\022\016.context.Empty\032\026.context.Con" +
-      "textIdList\"\000\0226\n\014ListContexts\022\016.context.E" +
-      "mpty\032\024.context.ContextList\"\000\0224\n\nGetConte" +
-      "xt\022\022.context.ContextId\032\020.context.Context" +
-      "\"\000\0224\n\nSetContext\022\020.context.Context\032\022.con" +
-      "text.ContextId\"\000\0225\n\rRemoveContext\022\022.cont" +
-      "ext.ContextId\032\016.context.Empty\"\000\022=\n\020GetCo" +
-      "ntextEvents\022\016.context.Empty\032\025.context.Co" +
-      "ntextEvent\"\0000\001\022@\n\017ListTopologyIds\022\022.cont" +
-      "ext.ContextId\032\027.context.TopologyIdList\"\000" +
-      "\022=\n\016ListTopologies\022\022.context.ContextId\032\025" +
-      ".context.TopologyList\"\000\0227\n\013GetTopology\022\023" +
-      ".context.TopologyId\032\021.context.Topology\"\000" +
-      "\022E\n\022GetTopologyDetails\022\023.context.Topolog" +
-      "yId\032\030.context.TopologyDetails\"\000\0227\n\013SetTo" +
-      "pology\022\021.context.Topology\032\023.context.Topo" +
-      "logyId\"\000\0227\n\016RemoveTopology\022\023.context.Top" +
-      "ologyId\032\016.context.Empty\"\000\022?\n\021GetTopology" +
-      "Events\022\016.context.Empty\032\026.context.Topolog" +
-      "yEvent\"\0000\001\0228\n\rListDeviceIds\022\016.context.Em" +
-      "pty\032\025.context.DeviceIdList\"\000\0224\n\013ListDevi" +
-      "ces\022\016.context.Empty\032\023.context.DeviceList" +
-      "\"\000\0221\n\tGetDevice\022\021.context.DeviceId\032\017.con" +
-      "text.Device\"\000\0221\n\tSetDevice\022\017.context.Dev" +
-      "ice\032\021.context.DeviceId\"\000\0223\n\014RemoveDevice" +
-      "\022\021.context.DeviceId\032\016.context.Empty\"\000\022;\n" +
-      "\017GetDeviceEvents\022\016.context.Empty\032\024.conte" +
-      "xt.DeviceEvent\"\0000\001\022<\n\014SelectDevice\022\025.con" +
-      "text.DeviceFilter\032\023.context.DeviceList\"\000" +
-      "\022I\n\021ListEndPointNames\022\027.context.EndPoint" +
-      "IdList\032\031.context.EndPointNameList\"\000\0224\n\013L" +
-      "istLinkIds\022\016.context.Empty\032\023.context.Lin" +
-      "kIdList\"\000\0220\n\tListLinks\022\016.context.Empty\032\021" +
-      ".context.LinkList\"\000\022+\n\007GetLink\022\017.context" +
-      ".LinkId\032\r.context.Link\"\000\022+\n\007SetLink\022\r.co" +
-      "ntext.Link\032\017.context.LinkId\"\000\022/\n\nRemoveL" +
-      "ink\022\017.context.LinkId\032\016.context.Empty\"\000\0227" +
-      "\n\rGetLinkEvents\022\016.context.Empty\032\022.contex" +
-      "t.LinkEvent\"\0000\001\022>\n\016ListServiceIds\022\022.cont" +
-      "ext.ContextId\032\026.context.ServiceIdList\"\000\022" +
-      ":\n\014ListServices\022\022.context.ContextId\032\024.co" +
-      "ntext.ServiceList\"\000\0224\n\nGetService\022\022.cont" +
-      "ext.ServiceId\032\020.context.Service\"\000\0224\n\nSet" +
-      "Service\022\020.context.Service\032\022.context.Serv" +
-      "iceId\"\000\0226\n\014UnsetService\022\020.context.Servic" +
-      "e\032\022.context.ServiceId\"\000\0225\n\rRemoveService" +
-      "\022\022.context.ServiceId\032\016.context.Empty\"\000\022=" +
-      "\n\020GetServiceEvents\022\016.context.Empty\032\025.con" +
-      "text.ServiceEvent\"\0000\001\022?\n\rSelectService\022\026" +
-      ".context.ServiceFilter\032\024.context.Service" +
-      "List\"\000\022:\n\014ListSliceIds\022\022.context.Context" +
-      "Id\032\024.context.SliceIdList\"\000\0226\n\nListSlices" +
-      "\022\022.context.ContextId\032\022.context.SliceList" +
-      "\"\000\022.\n\010GetSlice\022\020.context.SliceId\032\016.conte" +
-      "xt.Slice\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020" +
-      ".context.SliceId\"\000\0220\n\nUnsetSlice\022\016.conte" +
-      "xt.Slice\032\020.context.SliceId\"\000\0221\n\013RemoveSl" +
-      "ice\022\020.context.SliceId\032\016.context.Empty\"\000\022" +
-      "9\n\016GetSliceEvents\022\016.context.Empty\032\023.cont" +
-      "ext.SliceEvent\"\0000\001\0229\n\013SelectSlice\022\024.cont" +
-      "ext.SliceFilter\032\022.context.SliceList\"\000\022D\n" +
-      "\021ListConnectionIds\022\022.context.ServiceId\032\031" +
-      ".context.ConnectionIdList\"\000\022@\n\017ListConne" +
-      "ctions\022\022.context.ServiceId\032\027.context.Con" +
-      "nectionList\"\000\022=\n\rGetConnection\022\025.context" +
-      ".ConnectionId\032\023.context.Connection\"\000\022=\n\r" +
-      "SetConnection\022\023.context.Connection\032\025.con" +
-      "text.ConnectionId\"\000\022;\n\020RemoveConnection\022" +
-      "\025.context.ConnectionId\032\016.context.Empty\"\000" +
-      "\022C\n\023GetConnectionEvents\022\016.context.Empty\032" +
-      "\030.context.ConnectionEvent\"\0000\001b\006proto3"
+      "\020\007\022 \n\034DEVICEDRIVER_GNMI_OPENCONFIG\020\010\022\032\n\026" +
+      "DEVICEDRIVER_FLEXSCALE\020\t\022\032\n\026DEVICEDRIVER" +
+      "_IETF_ACTN\020\n*\217\001\n\033DeviceOperationalStatus" +
+      "Enum\022%\n!DEVICEOPERATIONALSTATUS_UNDEFINE" +
+      "D\020\000\022$\n DEVICEOPERATIONALSTATUS_DISABLED\020" +
+      "\001\022#\n\037DEVICEOPERATIONALSTATUS_ENABLED\020\002*\252" +
+      "\001\n\017ServiceTypeEnum\022\027\n\023SERVICETYPE_UNKNOW" +
+      "N\020\000\022\024\n\020SERVICETYPE_L3NM\020\001\022\024\n\020SERVICETYPE" +
+      "_L2NM\020\002\022)\n%SERVICETYPE_TAPI_CONNECTIVITY" +
+      "_SERVICE\020\003\022\022\n\016SERVICETYPE_TE\020\004\022\023\n\017SERVIC" +
+      "ETYPE_E2E\020\005*\304\001\n\021ServiceStatusEnum\022\033\n\027SER" +
+      "VICESTATUS_UNDEFINED\020\000\022\031\n\025SERVICESTATUS_" +
+      "PLANNED\020\001\022\030\n\024SERVICESTATUS_ACTIVE\020\002\022\032\n\026S" +
+      "ERVICESTATUS_UPDATING\020\003\022!\n\035SERVICESTATUS" +
+      "_PENDING_REMOVAL\020\004\022\036\n\032SERVICESTATUS_SLA_" +
+      "VIOLATED\020\005*\251\001\n\017SliceStatusEnum\022\031\n\025SLICES" +
+      "TATUS_UNDEFINED\020\000\022\027\n\023SLICESTATUS_PLANNED" +
+      "\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026\n\022SLICESTATUS_" +
+      "ACTIVE\020\003\022\026\n\022SLICESTATUS_DEINIT\020\004\022\034\n\030SLIC" +
+      "ESTATUS_SLA_VIOLATED\020\005*]\n\020ConfigActionEn" +
+      "um\022\032\n\026CONFIGACTION_UNDEFINED\020\000\022\024\n\020CONFIG" +
+      "ACTION_SET\020\001\022\027\n\023CONFIGACTION_DELETE\020\002*m\n" +
+      "\024ConstraintActionEnum\022\036\n\032CONSTRAINTACTIO" +
+      "N_UNDEFINED\020\000\022\030\n\024CONSTRAINTACTION_SET\020\001\022" +
+      "\033\n\027CONSTRAINTACTION_DELETE\020\002*\203\002\n\022Isolati" +
+      "onLevelEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYSICA" +
+      "L_ISOLATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022\025\n\021" +
+      "PROCESS_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMORY_I" +
+      "SOLATION\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLATION" +
+      "\020\005\022\036\n\032VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n\033NE" +
+      "TWORK_FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVICE_I" +
+      "SOLATION\020\0102\245\026\n\016ContextService\022:\n\016ListCon" +
+      "textIds\022\016.context.Empty\032\026.context.Contex" +
+      "tIdList\"\000\0226\n\014ListContexts\022\016.context.Empt" +
+      "y\032\024.context.ContextList\"\000\0224\n\nGetContext\022" +
+      "\022.context.ContextId\032\020.context.Context\"\000\022" +
+      "4\n\nSetContext\022\020.context.Context\032\022.contex" +
+      "t.ContextId\"\000\0225\n\rRemoveContext\022\022.context" +
+      ".ContextId\032\016.context.Empty\"\000\022=\n\020GetConte" +
+      "xtEvents\022\016.context.Empty\032\025.context.Conte" +
+      "xtEvent\"\0000\001\022@\n\017ListTopologyIds\022\022.context" +
+      ".ContextId\032\027.context.TopologyIdList\"\000\022=\n" +
+      "\016ListTopologies\022\022.context.ContextId\032\025.co" +
+      "ntext.TopologyList\"\000\0227\n\013GetTopology\022\023.co" +
+      "ntext.TopologyId\032\021.context.Topology\"\000\022E\n" +
+      "\022GetTopologyDetails\022\023.context.TopologyId" +
+      "\032\030.context.TopologyDetails\"\000\0227\n\013SetTopol" +
+      "ogy\022\021.context.Topology\032\023.context.Topolog" +
+      "yId\"\000\0227\n\016RemoveTopology\022\023.context.Topolo" +
+      "gyId\032\016.context.Empty\"\000\022?\n\021GetTopologyEve" +
+      "nts\022\016.context.Empty\032\026.context.TopologyEv" +
+      "ent\"\0000\001\0228\n\rListDeviceIds\022\016.context.Empty" +
+      "\032\025.context.DeviceIdList\"\000\0224\n\013ListDevices" +
+      "\022\016.context.Empty\032\023.context.DeviceList\"\000\022" +
+      "1\n\tGetDevice\022\021.context.DeviceId\032\017.contex" +
+      "t.Device\"\000\0221\n\tSetDevice\022\017.context.Device" +
+      "\032\021.context.DeviceId\"\000\0223\n\014RemoveDevice\022\021." +
+      "context.DeviceId\032\016.context.Empty\"\000\022;\n\017Ge" +
+      "tDeviceEvents\022\016.context.Empty\032\024.context." +
+      "DeviceEvent\"\0000\001\022<\n\014SelectDevice\022\025.contex" +
+      "t.DeviceFilter\032\023.context.DeviceList\"\000\022I\n" +
+      "\021ListEndPointNames\022\027.context.EndPointIdL" +
+      "ist\032\031.context.EndPointNameList\"\000\0224\n\013List" +
+      "LinkIds\022\016.context.Empty\032\023.context.LinkId" +
+      "List\"\000\0220\n\tListLinks\022\016.context.Empty\032\021.co" +
+      "ntext.LinkList\"\000\022+\n\007GetLink\022\017.context.Li" +
+      "nkId\032\r.context.Link\"\000\022+\n\007SetLink\022\r.conte" +
+      "xt.Link\032\017.context.LinkId\"\000\022/\n\nRemoveLink" +
+      "\022\017.context.LinkId\032\016.context.Empty\"\000\0227\n\rG" +
+      "etLinkEvents\022\016.context.Empty\032\022.context.L" +
+      "inkEvent\"\0000\001\022>\n\016ListServiceIds\022\022.context" +
+      ".ContextId\032\026.context.ServiceIdList\"\000\022:\n\014" +
+      "ListServices\022\022.context.ContextId\032\024.conte" +
+      "xt.ServiceList\"\000\0224\n\nGetService\022\022.context" +
+      ".ServiceId\032\020.context.Service\"\000\0224\n\nSetSer" +
+      "vice\022\020.context.Service\032\022.context.Service" +
+      "Id\"\000\0226\n\014UnsetService\022\020.context.Service\032\022" +
+      ".context.ServiceId\"\000\0225\n\rRemoveService\022\022." +
+      "context.ServiceId\032\016.context.Empty\"\000\022=\n\020G" +
+      "etServiceEvents\022\016.context.Empty\032\025.contex" +
+      "t.ServiceEvent\"\0000\001\022?\n\rSelectService\022\026.co" +
+      "ntext.ServiceFilter\032\024.context.ServiceLis" +
+      "t\"\000\022:\n\014ListSliceIds\022\022.context.ContextId\032" +
+      "\024.context.SliceIdList\"\000\0226\n\nListSlices\022\022." +
+      "context.ContextId\032\022.context.SliceList\"\000\022" +
+      ".\n\010GetSlice\022\020.context.SliceId\032\016.context." +
+      "Slice\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020.co" +
+      "ntext.SliceId\"\000\0220\n\nUnsetSlice\022\016.context." +
+      "Slice\032\020.context.SliceId\"\000\0221\n\013RemoveSlice" +
+      "\022\020.context.SliceId\032\016.context.Empty\"\000\0229\n\016" +
+      "GetSliceEvents\022\016.context.Empty\032\023.context" +
+      ".SliceEvent\"\0000\001\0229\n\013SelectSlice\022\024.context" +
+      ".SliceFilter\032\022.context.SliceList\"\000\022D\n\021Li" +
+      "stConnectionIds\022\022.context.ServiceId\032\031.co" +
+      "ntext.ConnectionIdList\"\000\022@\n\017ListConnecti" +
+      "ons\022\022.context.ServiceId\032\027.context.Connec" +
+      "tionList\"\000\022=\n\rGetConnection\022\025.context.Co" +
+      "nnectionId\032\023.context.Connection\"\000\022=\n\rSet" +
+      "Connection\022\023.context.Connection\032\025.contex" +
+      "t.ConnectionId\"\000\022;\n\020RemoveConnection\022\025.c" +
+      "ontext.ConnectionId\032\016.context.Empty\"\000\022C\n" +
+      "\023GetConnectionEvents\022\016.context.Empty\032\030.c" +
+      "ontext.ConnectionEvent\"\0000\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index 5cd1f1c4c1b4ce437c16707018f83ef6ec60215a..55847f89e7c031de854d1e54336342f7a24e320a 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: 46486023929121fc955e9550fc8fd625ded433d2
-    app.quarkus.io/build-timestamp: 2023-12-15 - 11:56:20 +0000
+    app.quarkus.io/commit-id: 5f8866be9cb91871607627819258b0b375410467
+    app.quarkus.io/build-timestamp: 2024-01-26 - 16:40:15 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8080"
@@ -15,12 +15,12 @@ metadata:
   name: policyservice
 spec:
   ports:
-    - name: grpc-server
-      port: 6060
-      targetPort: 6060
     - name: http
       port: 9192
       targetPort: 8080
+    - name: grpc-server
+      port: 6060
+      targetPort: 6060
   selector:
     app.kubernetes.io/name: policyservice
   type: ClusterIP
@@ -29,8 +29,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
-    app.quarkus.io/build-timestamp: 2023-12-15 - 11:56:20 +0000
+    app.quarkus.io/commit-id: 5f8866be9cb91871607627819258b0b375410467
+    app.quarkus.io/build-timestamp: 2024-01-26 - 16:40:15 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8080"
@@ -47,8 +47,8 @@ spec:
   template:
     metadata:
       annotations:
-        app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
-        app.quarkus.io/build-timestamp: 2023-12-15 - 11:56:20 +0000
+        app.quarkus.io/commit-id: 5f8866be9cb91871607627819258b0b375410467
+        app.quarkus.io/build-timestamp: 2024-01-26 - 16:40:15 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8080"
@@ -63,12 +63,12 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: CONTEXT_SERVICE_HOST
-              value: contextservice
-            - name: MONITORING_SERVICE_HOST
-              value: monitoringservice
             - name: SERVICE_SERVICE_HOST
               value: serviceservice
+            - name: MONITORING_SERVICE_HOST
+              value: monitoringservice
+            - name: CONTEXT_SERVICE_HOST
+              value: contextservice
           image: labs.etsi.org:5050/tfs/controller/policy:0.1.0
           imagePullPolicy: Always
           livenessProbe:
@@ -83,12 +83,12 @@ spec:
             timeoutSeconds: 10
           name: policyservice
           ports:
-            - containerPort: 6060
-              name: grpc-server
-              protocol: TCP
             - containerPort: 8080
               name: http
               protocol: TCP
+            - containerPort: 6060
+              name: grpc-server
+              protocol: TCP
           readinessProbe:
             failureThreshold: 3
             httpGet:
diff --git a/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java
index 7c87b0638272edb58ef3cd57d3aad7aa3365cca8..8e89be8a6ddc993e7d90794c756f406fa72104f2 100644
--- a/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java
+++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java
@@ -24,5 +24,8 @@ public enum DeviceDriverEnum {
     IETF_NETWORK_TOPOLOGY,
     ONF_TR_532,
     XR,
-    IETF_L2VPN
+    IETF_L2VPN,
+    GNMI_OPENCONFIG,
+    FLEXSCALE,
+    IETF_ACTN
 }
diff --git a/src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java b/src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java
index 37c6df36d01140f947378493da8f4c568b15650b..67048119d0b0cdb8d1fb2df2dcb2659b0870efb3 100644
--- a/src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java
+++ b/src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java
@@ -1227,11 +1227,9 @@ class SerializerTest {
                         DeviceDriverEnum.GNMI_OPENCONFIG,
                         ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG),
                 Arguments.of(
-                        DeviceDriverEnum.FLEXSCALE,
-                        ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE),
+                        DeviceDriverEnum.FLEXSCALE, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE),
                 Arguments.of(
-                        DeviceDriverEnum.IETF_ACTN,
-                        ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN),
+                        DeviceDriverEnum.IETF_ACTN, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN),
                 Arguments.of(
                         DeviceDriverEnum.UNDEFINED, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_UNDEFINED));
     }
diff --git a/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java b/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java
index a25798b884d9006f9c1b218c133634784f8bf392..d4873899b0113a7356c1c4d6bc2ea9aae2e8b4e5 100644
--- a/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java
+++ b/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java
@@ -185,6 +185,14 @@ public final class ContextOuterClass {
      * <code>DEVICEDRIVER_GNMI_OPENCONFIG = 8;</code>
      */
     DEVICEDRIVER_GNMI_OPENCONFIG(8),
+    /**
+     * <code>DEVICEDRIVER_FLEXSCALE = 9;</code>
+     */
+    DEVICEDRIVER_FLEXSCALE(9),
+    /**
+     * <code>DEVICEDRIVER_IETF_ACTN = 10;</code>
+     */
+    DEVICEDRIVER_IETF_ACTN(10),
     UNRECOGNIZED(-1),
     ;
 
@@ -228,6 +236,14 @@ public final class ContextOuterClass {
      * <code>DEVICEDRIVER_GNMI_OPENCONFIG = 8;</code>
      */
     public static final int DEVICEDRIVER_GNMI_OPENCONFIG_VALUE = 8;
+    /**
+     * <code>DEVICEDRIVER_FLEXSCALE = 9;</code>
+     */
+    public static final int DEVICEDRIVER_FLEXSCALE_VALUE = 9;
+    /**
+     * <code>DEVICEDRIVER_IETF_ACTN = 10;</code>
+     */
+    public static final int DEVICEDRIVER_IETF_ACTN_VALUE = 10;
 
 
     public final int getNumber() {
@@ -263,6 +279,8 @@ public final class ContextOuterClass {
         case 6: return DEVICEDRIVER_XR;
         case 7: return DEVICEDRIVER_IETF_L2VPN;
         case 8: return DEVICEDRIVER_GNMI_OPENCONFIG;
+        case 9: return DEVICEDRIVER_FLEXSCALE;
+        case 10: return DEVICEDRIVER_IETF_ACTN;
         default: return null;
       }
     }
@@ -461,6 +479,10 @@ public final class ContextOuterClass {
      * <code>SERVICETYPE_TE = 4;</code>
      */
     SERVICETYPE_TE(4),
+    /**
+     * <code>SERVICETYPE_E2E = 5;</code>
+     */
+    SERVICETYPE_E2E(5),
     UNRECOGNIZED(-1),
     ;
 
@@ -484,6 +506,10 @@ public final class ContextOuterClass {
      * <code>SERVICETYPE_TE = 4;</code>
      */
     public static final int SERVICETYPE_TE_VALUE = 4;
+    /**
+     * <code>SERVICETYPE_E2E = 5;</code>
+     */
+    public static final int SERVICETYPE_E2E_VALUE = 5;
 
 
     public final int getNumber() {
@@ -515,6 +541,7 @@ public final class ContextOuterClass {
         case 2: return SERVICETYPE_L2NM;
         case 3: return SERVICETYPE_TAPI_CONNECTIVITY_SERVICE;
         case 4: return SERVICETYPE_TE;
+        case 5: return SERVICETYPE_E2E;
         default: return null;
       }
     }
@@ -75826,114 +75853,116 @@ public final class ContextOuterClass {
       "\0132\022.context.ContextId\022\025\n\rauthenticated\030\002" +
       " \001(\010*j\n\rEventTypeEnum\022\027\n\023EVENTTYPE_UNDEF" +
       "INED\020\000\022\024\n\020EVENTTYPE_CREATE\020\001\022\024\n\020EVENTTYP" +
-      "E_UPDATE\020\002\022\024\n\020EVENTTYPE_REMOVE\020\003*\231\002\n\020Dev" +
+      "E_UPDATE\020\002\022\024\n\020EVENTTYPE_REMOVE\020\003*\321\002\n\020Dev" +
       "iceDriverEnum\022\032\n\026DEVICEDRIVER_UNDEFINED\020" +
       "\000\022\033\n\027DEVICEDRIVER_OPENCONFIG\020\001\022\036\n\032DEVICE" +
       "DRIVER_TRANSPORT_API\020\002\022\023\n\017DEVICEDRIVER_P" +
       "4\020\003\022&\n\"DEVICEDRIVER_IETF_NETWORK_TOPOLOG" +
       "Y\020\004\022\033\n\027DEVICEDRIVER_ONF_TR_532\020\005\022\023\n\017DEVI" +
       "CEDRIVER_XR\020\006\022\033\n\027DEVICEDRIVER_IETF_L2VPN" +
-      "\020\007\022 \n\034DEVICEDRIVER_GNMI_OPENCONFIG\020\010*\217\001\n" +
-      "\033DeviceOperationalStatusEnum\022%\n!DEVICEOP" +
-      "ERATIONALSTATUS_UNDEFINED\020\000\022$\n DEVICEOPE" +
-      "RATIONALSTATUS_DISABLED\020\001\022#\n\037DEVICEOPERA" +
-      "TIONALSTATUS_ENABLED\020\002*\225\001\n\017ServiceTypeEn" +
-      "um\022\027\n\023SERVICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETY" +
-      "PE_L3NM\020\001\022\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVI" +
-      "CETYPE_TAPI_CONNECTIVITY_SERVICE\020\003\022\022\n\016SE" +
-      "RVICETYPE_TE\020\004*\304\001\n\021ServiceStatusEnum\022\033\n\027" +
-      "SERVICESTATUS_UNDEFINED\020\000\022\031\n\025SERVICESTAT" +
-      "US_PLANNED\020\001\022\030\n\024SERVICESTATUS_ACTIVE\020\002\022\032" +
-      "\n\026SERVICESTATUS_UPDATING\020\003\022!\n\035SERVICESTA" +
-      "TUS_PENDING_REMOVAL\020\004\022\036\n\032SERVICESTATUS_S" +
-      "LA_VIOLATED\020\005*\251\001\n\017SliceStatusEnum\022\031\n\025SLI" +
-      "CESTATUS_UNDEFINED\020\000\022\027\n\023SLICESTATUS_PLAN" +
-      "NED\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026\n\022SLICESTAT" +
-      "US_ACTIVE\020\003\022\026\n\022SLICESTATUS_DEINIT\020\004\022\034\n\030S" +
-      "LICESTATUS_SLA_VIOLATED\020\005*]\n\020ConfigActio" +
-      "nEnum\022\032\n\026CONFIGACTION_UNDEFINED\020\000\022\024\n\020CON" +
-      "FIGACTION_SET\020\001\022\027\n\023CONFIGACTION_DELETE\020\002" +
-      "*m\n\024ConstraintActionEnum\022\036\n\032CONSTRAINTAC" +
-      "TION_UNDEFINED\020\000\022\030\n\024CONSTRAINTACTION_SET" +
-      "\020\001\022\033\n\027CONSTRAINTACTION_DELETE\020\002*\203\002\n\022Isol" +
-      "ationLevelEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYS" +
-      "ICAL_ISOLATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022" +
-      "\025\n\021PROCESS_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMOR" +
-      "Y_ISOLATION\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLAT" +
-      "ION\020\005\022\036\n\032VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n" +
-      "\033NETWORK_FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVIC" +
-      "E_ISOLATION\020\0102\245\026\n\016ContextService\022:\n\016List" +
-      "ContextIds\022\016.context.Empty\032\026.context.Con" +
-      "textIdList\"\000\0226\n\014ListContexts\022\016.context.E" +
-      "mpty\032\024.context.ContextList\"\000\0224\n\nGetConte" +
-      "xt\022\022.context.ContextId\032\020.context.Context" +
-      "\"\000\0224\n\nSetContext\022\020.context.Context\032\022.con" +
-      "text.ContextId\"\000\0225\n\rRemoveContext\022\022.cont" +
-      "ext.ContextId\032\016.context.Empty\"\000\022=\n\020GetCo" +
-      "ntextEvents\022\016.context.Empty\032\025.context.Co" +
-      "ntextEvent\"\0000\001\022@\n\017ListTopologyIds\022\022.cont" +
-      "ext.ContextId\032\027.context.TopologyIdList\"\000" +
-      "\022=\n\016ListTopologies\022\022.context.ContextId\032\025" +
-      ".context.TopologyList\"\000\0227\n\013GetTopology\022\023" +
-      ".context.TopologyId\032\021.context.Topology\"\000" +
-      "\022E\n\022GetTopologyDetails\022\023.context.Topolog" +
-      "yId\032\030.context.TopologyDetails\"\000\0227\n\013SetTo" +
-      "pology\022\021.context.Topology\032\023.context.Topo" +
-      "logyId\"\000\0227\n\016RemoveTopology\022\023.context.Top" +
-      "ologyId\032\016.context.Empty\"\000\022?\n\021GetTopology" +
-      "Events\022\016.context.Empty\032\026.context.Topolog" +
-      "yEvent\"\0000\001\0228\n\rListDeviceIds\022\016.context.Em" +
-      "pty\032\025.context.DeviceIdList\"\000\0224\n\013ListDevi" +
-      "ces\022\016.context.Empty\032\023.context.DeviceList" +
-      "\"\000\0221\n\tGetDevice\022\021.context.DeviceId\032\017.con" +
-      "text.Device\"\000\0221\n\tSetDevice\022\017.context.Dev" +
-      "ice\032\021.context.DeviceId\"\000\0223\n\014RemoveDevice" +
-      "\022\021.context.DeviceId\032\016.context.Empty\"\000\022;\n" +
-      "\017GetDeviceEvents\022\016.context.Empty\032\024.conte" +
-      "xt.DeviceEvent\"\0000\001\022<\n\014SelectDevice\022\025.con" +
-      "text.DeviceFilter\032\023.context.DeviceList\"\000" +
-      "\022I\n\021ListEndPointNames\022\027.context.EndPoint" +
-      "IdList\032\031.context.EndPointNameList\"\000\0224\n\013L" +
-      "istLinkIds\022\016.context.Empty\032\023.context.Lin" +
-      "kIdList\"\000\0220\n\tListLinks\022\016.context.Empty\032\021" +
-      ".context.LinkList\"\000\022+\n\007GetLink\022\017.context" +
-      ".LinkId\032\r.context.Link\"\000\022+\n\007SetLink\022\r.co" +
-      "ntext.Link\032\017.context.LinkId\"\000\022/\n\nRemoveL" +
-      "ink\022\017.context.LinkId\032\016.context.Empty\"\000\0227" +
-      "\n\rGetLinkEvents\022\016.context.Empty\032\022.contex" +
-      "t.LinkEvent\"\0000\001\022>\n\016ListServiceIds\022\022.cont" +
-      "ext.ContextId\032\026.context.ServiceIdList\"\000\022" +
-      ":\n\014ListServices\022\022.context.ContextId\032\024.co" +
-      "ntext.ServiceList\"\000\0224\n\nGetService\022\022.cont" +
-      "ext.ServiceId\032\020.context.Service\"\000\0224\n\nSet" +
-      "Service\022\020.context.Service\032\022.context.Serv" +
-      "iceId\"\000\0226\n\014UnsetService\022\020.context.Servic" +
-      "e\032\022.context.ServiceId\"\000\0225\n\rRemoveService" +
-      "\022\022.context.ServiceId\032\016.context.Empty\"\000\022=" +
-      "\n\020GetServiceEvents\022\016.context.Empty\032\025.con" +
-      "text.ServiceEvent\"\0000\001\022?\n\rSelectService\022\026" +
-      ".context.ServiceFilter\032\024.context.Service" +
-      "List\"\000\022:\n\014ListSliceIds\022\022.context.Context" +
-      "Id\032\024.context.SliceIdList\"\000\0226\n\nListSlices" +
-      "\022\022.context.ContextId\032\022.context.SliceList" +
-      "\"\000\022.\n\010GetSlice\022\020.context.SliceId\032\016.conte" +
-      "xt.Slice\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020" +
-      ".context.SliceId\"\000\0220\n\nUnsetSlice\022\016.conte" +
-      "xt.Slice\032\020.context.SliceId\"\000\0221\n\013RemoveSl" +
-      "ice\022\020.context.SliceId\032\016.context.Empty\"\000\022" +
-      "9\n\016GetSliceEvents\022\016.context.Empty\032\023.cont" +
-      "ext.SliceEvent\"\0000\001\0229\n\013SelectSlice\022\024.cont" +
-      "ext.SliceFilter\032\022.context.SliceList\"\000\022D\n" +
-      "\021ListConnectionIds\022\022.context.ServiceId\032\031" +
-      ".context.ConnectionIdList\"\000\022@\n\017ListConne" +
-      "ctions\022\022.context.ServiceId\032\027.context.Con" +
-      "nectionList\"\000\022=\n\rGetConnection\022\025.context" +
-      ".ConnectionId\032\023.context.Connection\"\000\022=\n\r" +
-      "SetConnection\022\023.context.Connection\032\025.con" +
-      "text.ConnectionId\"\000\022;\n\020RemoveConnection\022" +
-      "\025.context.ConnectionId\032\016.context.Empty\"\000" +
-      "\022C\n\023GetConnectionEvents\022\016.context.Empty\032" +
-      "\030.context.ConnectionEvent\"\0000\001b\006proto3"
+      "\020\007\022 \n\034DEVICEDRIVER_GNMI_OPENCONFIG\020\010\022\032\n\026" +
+      "DEVICEDRIVER_FLEXSCALE\020\t\022\032\n\026DEVICEDRIVER" +
+      "_IETF_ACTN\020\n*\217\001\n\033DeviceOperationalStatus" +
+      "Enum\022%\n!DEVICEOPERATIONALSTATUS_UNDEFINE" +
+      "D\020\000\022$\n DEVICEOPERATIONALSTATUS_DISABLED\020" +
+      "\001\022#\n\037DEVICEOPERATIONALSTATUS_ENABLED\020\002*\252" +
+      "\001\n\017ServiceTypeEnum\022\027\n\023SERVICETYPE_UNKNOW" +
+      "N\020\000\022\024\n\020SERVICETYPE_L3NM\020\001\022\024\n\020SERVICETYPE" +
+      "_L2NM\020\002\022)\n%SERVICETYPE_TAPI_CONNECTIVITY" +
+      "_SERVICE\020\003\022\022\n\016SERVICETYPE_TE\020\004\022\023\n\017SERVIC" +
+      "ETYPE_E2E\020\005*\304\001\n\021ServiceStatusEnum\022\033\n\027SER" +
+      "VICESTATUS_UNDEFINED\020\000\022\031\n\025SERVICESTATUS_" +
+      "PLANNED\020\001\022\030\n\024SERVICESTATUS_ACTIVE\020\002\022\032\n\026S" +
+      "ERVICESTATUS_UPDATING\020\003\022!\n\035SERVICESTATUS" +
+      "_PENDING_REMOVAL\020\004\022\036\n\032SERVICESTATUS_SLA_" +
+      "VIOLATED\020\005*\251\001\n\017SliceStatusEnum\022\031\n\025SLICES" +
+      "TATUS_UNDEFINED\020\000\022\027\n\023SLICESTATUS_PLANNED" +
+      "\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026\n\022SLICESTATUS_" +
+      "ACTIVE\020\003\022\026\n\022SLICESTATUS_DEINIT\020\004\022\034\n\030SLIC" +
+      "ESTATUS_SLA_VIOLATED\020\005*]\n\020ConfigActionEn" +
+      "um\022\032\n\026CONFIGACTION_UNDEFINED\020\000\022\024\n\020CONFIG" +
+      "ACTION_SET\020\001\022\027\n\023CONFIGACTION_DELETE\020\002*m\n" +
+      "\024ConstraintActionEnum\022\036\n\032CONSTRAINTACTIO" +
+      "N_UNDEFINED\020\000\022\030\n\024CONSTRAINTACTION_SET\020\001\022" +
+      "\033\n\027CONSTRAINTACTION_DELETE\020\002*\203\002\n\022Isolati" +
+      "onLevelEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYSICA" +
+      "L_ISOLATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022\025\n\021" +
+      "PROCESS_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMORY_I" +
+      "SOLATION\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLATION" +
+      "\020\005\022\036\n\032VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n\033NE" +
+      "TWORK_FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVICE_I" +
+      "SOLATION\020\0102\245\026\n\016ContextService\022:\n\016ListCon" +
+      "textIds\022\016.context.Empty\032\026.context.Contex" +
+      "tIdList\"\000\0226\n\014ListContexts\022\016.context.Empt" +
+      "y\032\024.context.ContextList\"\000\0224\n\nGetContext\022" +
+      "\022.context.ContextId\032\020.context.Context\"\000\022" +
+      "4\n\nSetContext\022\020.context.Context\032\022.contex" +
+      "t.ContextId\"\000\0225\n\rRemoveContext\022\022.context" +
+      ".ContextId\032\016.context.Empty\"\000\022=\n\020GetConte" +
+      "xtEvents\022\016.context.Empty\032\025.context.Conte" +
+      "xtEvent\"\0000\001\022@\n\017ListTopologyIds\022\022.context" +
+      ".ContextId\032\027.context.TopologyIdList\"\000\022=\n" +
+      "\016ListTopologies\022\022.context.ContextId\032\025.co" +
+      "ntext.TopologyList\"\000\0227\n\013GetTopology\022\023.co" +
+      "ntext.TopologyId\032\021.context.Topology\"\000\022E\n" +
+      "\022GetTopologyDetails\022\023.context.TopologyId" +
+      "\032\030.context.TopologyDetails\"\000\0227\n\013SetTopol" +
+      "ogy\022\021.context.Topology\032\023.context.Topolog" +
+      "yId\"\000\0227\n\016RemoveTopology\022\023.context.Topolo" +
+      "gyId\032\016.context.Empty\"\000\022?\n\021GetTopologyEve" +
+      "nts\022\016.context.Empty\032\026.context.TopologyEv" +
+      "ent\"\0000\001\0228\n\rListDeviceIds\022\016.context.Empty" +
+      "\032\025.context.DeviceIdList\"\000\0224\n\013ListDevices" +
+      "\022\016.context.Empty\032\023.context.DeviceList\"\000\022" +
+      "1\n\tGetDevice\022\021.context.DeviceId\032\017.contex" +
+      "t.Device\"\000\0221\n\tSetDevice\022\017.context.Device" +
+      "\032\021.context.DeviceId\"\000\0223\n\014RemoveDevice\022\021." +
+      "context.DeviceId\032\016.context.Empty\"\000\022;\n\017Ge" +
+      "tDeviceEvents\022\016.context.Empty\032\024.context." +
+      "DeviceEvent\"\0000\001\022<\n\014SelectDevice\022\025.contex" +
+      "t.DeviceFilter\032\023.context.DeviceList\"\000\022I\n" +
+      "\021ListEndPointNames\022\027.context.EndPointIdL" +
+      "ist\032\031.context.EndPointNameList\"\000\0224\n\013List" +
+      "LinkIds\022\016.context.Empty\032\023.context.LinkId" +
+      "List\"\000\0220\n\tListLinks\022\016.context.Empty\032\021.co" +
+      "ntext.LinkList\"\000\022+\n\007GetLink\022\017.context.Li" +
+      "nkId\032\r.context.Link\"\000\022+\n\007SetLink\022\r.conte" +
+      "xt.Link\032\017.context.LinkId\"\000\022/\n\nRemoveLink" +
+      "\022\017.context.LinkId\032\016.context.Empty\"\000\0227\n\rG" +
+      "etLinkEvents\022\016.context.Empty\032\022.context.L" +
+      "inkEvent\"\0000\001\022>\n\016ListServiceIds\022\022.context" +
+      ".ContextId\032\026.context.ServiceIdList\"\000\022:\n\014" +
+      "ListServices\022\022.context.ContextId\032\024.conte" +
+      "xt.ServiceList\"\000\0224\n\nGetService\022\022.context" +
+      ".ServiceId\032\020.context.Service\"\000\0224\n\nSetSer" +
+      "vice\022\020.context.Service\032\022.context.Service" +
+      "Id\"\000\0226\n\014UnsetService\022\020.context.Service\032\022" +
+      ".context.ServiceId\"\000\0225\n\rRemoveService\022\022." +
+      "context.ServiceId\032\016.context.Empty\"\000\022=\n\020G" +
+      "etServiceEvents\022\016.context.Empty\032\025.contex" +
+      "t.ServiceEvent\"\0000\001\022?\n\rSelectService\022\026.co" +
+      "ntext.ServiceFilter\032\024.context.ServiceLis" +
+      "t\"\000\022:\n\014ListSliceIds\022\022.context.ContextId\032" +
+      "\024.context.SliceIdList\"\000\0226\n\nListSlices\022\022." +
+      "context.ContextId\032\022.context.SliceList\"\000\022" +
+      ".\n\010GetSlice\022\020.context.SliceId\032\016.context." +
+      "Slice\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020.co" +
+      "ntext.SliceId\"\000\0220\n\nUnsetSlice\022\016.context." +
+      "Slice\032\020.context.SliceId\"\000\0221\n\013RemoveSlice" +
+      "\022\020.context.SliceId\032\016.context.Empty\"\000\0229\n\016" +
+      "GetSliceEvents\022\016.context.Empty\032\023.context" +
+      ".SliceEvent\"\0000\001\0229\n\013SelectSlice\022\024.context" +
+      ".SliceFilter\032\022.context.SliceList\"\000\022D\n\021Li" +
+      "stConnectionIds\022\022.context.ServiceId\032\031.co" +
+      "ntext.ConnectionIdList\"\000\022@\n\017ListConnecti" +
+      "ons\022\022.context.ServiceId\032\027.context.Connec" +
+      "tionList\"\000\022=\n\rGetConnection\022\025.context.Co" +
+      "nnectionId\032\023.context.Connection\"\000\022=\n\rSet" +
+      "Connection\022\023.context.Connection\032\025.contex" +
+      "t.ConnectionId\"\000\022;\n\020RemoveConnection\022\025.c" +
+      "ontext.ConnectionId\032\016.context.Empty\"\000\022C\n" +
+      "\023GetConnectionEvents\022\016.context.Empty\032\030.c" +
+      "ontext.ConnectionEvent\"\0000\001b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/ztp/target/kubernetes/kubernetes.yml b/src/ztp/target/kubernetes/kubernetes.yml
index f3e4a6d6dda261c4eac983552b01bb6a4f901e9f..d2a59eb05f056d69f021d897e89f1ab9cbb102ce 100644
--- a/src/ztp/target/kubernetes/kubernetes.yml
+++ b/src/ztp/target/kubernetes/kubernetes.yml
@@ -3,8 +3,8 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
-    app.quarkus.io/build-timestamp: 2023-12-15 - 12:04:12 +0000
+    app.quarkus.io/commit-id: 5f8866be9cb91871607627819258b0b375410467
+    app.quarkus.io/build-timestamp: 2024-01-26 - 16:39:32 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8080"
@@ -15,12 +15,12 @@ metadata:
   name: ztpservice
 spec:
   ports:
-    - name: grpc-server
-      port: 5050
-      targetPort: 5050
     - name: http
       port: 9192
       targetPort: 8080
+    - name: grpc-server
+      port: 5050
+      targetPort: 5050
   selector:
     app.kubernetes.io/name: ztpservice
   type: ClusterIP
@@ -29,8 +29,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
-    app.quarkus.io/build-timestamp: 2023-12-15 - 12:04:12 +0000
+    app.quarkus.io/commit-id: 5f8866be9cb91871607627819258b0b375410467
+    app.quarkus.io/build-timestamp: 2024-01-26 - 16:39:32 +0000
     prometheus.io/scrape: "true"
     prometheus.io/path: /q/metrics
     prometheus.io/port: "8080"
@@ -47,8 +47,8 @@ spec:
   template:
     metadata:
       annotations:
-        app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2
-        app.quarkus.io/build-timestamp: 2023-12-15 - 12:04:12 +0000
+        app.quarkus.io/commit-id: 5f8866be9cb91871607627819258b0b375410467
+        app.quarkus.io/build-timestamp: 2024-01-26 - 16:39:32 +0000
         prometheus.io/scrape: "true"
         prometheus.io/path: /q/metrics
         prometheus.io/port: "8080"
@@ -81,12 +81,12 @@ spec:
             timeoutSeconds: 10
           name: ztpservice
           ports:
-            - containerPort: 5050
-              name: grpc-server
-              protocol: TCP
             - containerPort: 8080
               name: http
               protocol: TCP
+            - containerPort: 5050
+              name: grpc-server
+              protocol: TCP
           readinessProbe:
             failureThreshold: 3
             httpGet: