diff --git a/proto/context-policy.proto b/proto/context_policy.proto
similarity index 100%
rename from proto/context-policy.proto
rename to proto/context_policy.proto
diff --git a/proto/policy.proto b/proto/policy.proto
index c093eb17a67c2b3ff7bfa690ddd639632ae67511..0879389bf857df51b7f777fd21a4a249ff69682d 100644
--- a/proto/policy.proto
+++ b/proto/policy.proto
@@ -16,8 +16,8 @@ syntax = "proto3";
 package policy;
 
 import "context.proto";
-import "policy-condition.proto";
-import "policy-action.proto";
+import "policy_condition.proto";
+import "policy_action.proto";
 
 service PolicyService {
   rpc PolicyAddService (PolicyRuleService) returns (PolicyRuleState) {}
diff --git a/proto/policy-action.proto b/proto/policy_action.proto
similarity index 100%
rename from proto/policy-action.proto
rename to proto/policy_action.proto
diff --git a/proto/policy-condition.proto b/proto/policy_condition.proto
similarity index 100%
rename from proto/policy-condition.proto
rename to proto/policy_condition.proto
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java b/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java
index 3af300d4914ef589d380c32a3389383c5dd37c0d..6185b4e9a334f5b5c24faec348877c352e945511 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java
@@ -34,7 +34,7 @@ public class ContextGatewayImpl implements ContextGateway {
     @GrpcClient("context")
     MutinyContextServiceStub streamingDelegateContext;
 
-    // TODO remove client when RPCs declared in context-policy.proto are moved in context.proto
+    // TODO remove client when RPCs declared in context_policy.proto are moved in context.proto
     //  and use streamingDelegateContext for all methods
     @GrpcClient("context_policy")
     MutinyContextPolicyServiceStub streamingDelegateContextPolicy;
diff --git a/src/policy/src/main/proto/context-policy.proto b/src/policy/src/main/proto/context-policy.proto
deleted file mode 120000
index 5c0888e9edf15c8fa540e85afabb98342c0e0c51..0000000000000000000000000000000000000000
--- a/src/policy/src/main/proto/context-policy.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../proto/context-policy.proto
\ No newline at end of file
diff --git a/src/policy/src/main/proto/context_policy.proto b/src/policy/src/main/proto/context_policy.proto
new file mode 120000
index 0000000000000000000000000000000000000000..d41593ddeb8b8b89878587e4fb389c94394ab340
--- /dev/null
+++ b/src/policy/src/main/proto/context_policy.proto
@@ -0,0 +1 @@
+../../../../../proto/context_policy.proto
\ No newline at end of file
diff --git a/src/policy/src/main/proto/policy-action.proto b/src/policy/src/main/proto/policy-action.proto
deleted file mode 120000
index bb1531bd6607ff005fdaae9d0be27ee65e3515ca..0000000000000000000000000000000000000000
--- a/src/policy/src/main/proto/policy-action.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../proto/policy-action.proto
\ No newline at end of file
diff --git a/src/policy/src/main/proto/policy-condition.proto b/src/policy/src/main/proto/policy-condition.proto
deleted file mode 120000
index f847d8b602252979135ead0876c50a161f049a72..0000000000000000000000000000000000000000
--- a/src/policy/src/main/proto/policy-condition.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../proto/policy-condition.proto
\ No newline at end of file
diff --git a/src/policy/src/main/proto/policy_action.proto b/src/policy/src/main/proto/policy_action.proto
new file mode 120000
index 0000000000000000000000000000000000000000..63dcef3d2c6753f9b732dc7491baa5f449e55eff
--- /dev/null
+++ b/src/policy/src/main/proto/policy_action.proto
@@ -0,0 +1 @@
+../../../../../proto/policy_action.proto
\ No newline at end of file
diff --git a/src/policy/src/main/proto/policy_condition.proto b/src/policy/src/main/proto/policy_condition.proto
new file mode 120000
index 0000000000000000000000000000000000000000..31f7d9d10539de8c0a1bf06cf6393b86ab223c16
--- /dev/null
+++ b/src/policy/src/main/proto/policy_condition.proto
@@ -0,0 +1 @@
+../../../../../proto/policy_condition.proto
\ No newline at end of file
diff --git a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicy.java b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicy.java
index 5048be4750db97e35f3007645927f2c7ea24be85..455aef779d7a0c29a4654b895e6c9652ca416e14 100644
--- a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicy.java
+++ b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicy.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: context-policy.proto
+// source: context_policy.proto
 
 package context_policy;
 
@@ -23,7 +23,7 @@ public final class ContextPolicy {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\024context-policy.proto\022\016context_policy\032\r" +
+      "\n\024context_policy.proto\022\016context_policy\032\r" +
       "context.proto\032\014policy.proto2\324\002\n\024ContextP" +
       "olicyService\022?\n\021ListPolicyRuleIds\022\016.cont" +
       "ext.Empty\032\030.policy.PolicyRuleIdList\"\000\022;\n" +
diff --git a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyService.java b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyService.java
index 4870737ab496fff5c36ffa0824e44669532ecec0..7ace0b9dcf220b80359a47781c1f8cdc1d9984ea 100644
--- a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyService.java
+++ b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyService.java
@@ -4,7 +4,7 @@ import io.quarkus.grpc.runtime.MutinyService;
 
 @javax.annotation.Generated(
 value = "by Mutiny Grpc generator",
-comments = "Source: context-policy.proto")
+comments = "Source: context_policy.proto")
 public interface ContextPolicyService extends MutinyService {
 
     
diff --git a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceBean.java b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceBean.java
index b1a93a6014a9fb0d9ae0d0e528fda1a1e2658416..a08761c67c484d5b35d22253364ccaf6beaa266c 100644
--- a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceBean.java
+++ b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceBean.java
@@ -6,7 +6,7 @@ import io.quarkus.grpc.runtime.MutinyBean;
 
 @javax.annotation.Generated(
 value = "by Mutiny Grpc generator",
-comments = "Source: context-policy.proto")
+comments = "Source: context_policy.proto")
 public class ContextPolicyServiceBean extends MutinyContextPolicyServiceGrpc.ContextPolicyServiceImplBase implements BindableService, MutinyBean {
 
     private final ContextPolicyService delegate;
diff --git a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceClient.java b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceClient.java
index d255415707710db2b225f4d4f7e3f7c4ee6fd6d5..98e57eeff41027e644057dced751b78837fd5fe3 100644
--- a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceClient.java
+++ b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceClient.java
@@ -6,7 +6,7 @@ import io.quarkus.grpc.runtime.MutinyClient;
 
 @javax.annotation.Generated(
 value = "by Mutiny Grpc generator",
-comments = "Source: context-policy.proto")
+comments = "Source: context_policy.proto")
 public class ContextPolicyServiceClient implements ContextPolicyService, MutinyClient<MutinyContextPolicyServiceGrpc.MutinyContextPolicyServiceStub> {
 
     private final MutinyContextPolicyServiceGrpc.MutinyContextPolicyServiceStub stub;
diff --git a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceGrpc.java b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceGrpc.java
index 69735c34ce57d91725f81c7c23d94ad60da1db9b..fa859ecff706640410d852ec129c359cb38be990 100644
--- a/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceGrpc.java
+++ b/src/policy/target/generated-sources/grpc/context_policy/ContextPolicyServiceGrpc.java
@@ -9,7 +9,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
  */
 @javax.annotation.Generated(
     value = "by gRPC proto compiler (version 1.38.1)",
-    comments = "Source: context-policy.proto")
+    comments = "Source: context_policy.proto")
 public final class ContextPolicyServiceGrpc {
 
   private ContextPolicyServiceGrpc() {}
diff --git a/src/policy/target/generated-sources/grpc/context_policy/MutinyContextPolicyServiceGrpc.java b/src/policy/target/generated-sources/grpc/context_policy/MutinyContextPolicyServiceGrpc.java
index 6e6e29c0468afe5656d537cd0fe79e7b9ede7bad..d9ff3b64cb48b70406954b72ace59035283ba701 100644
--- a/src/policy/target/generated-sources/grpc/context_policy/MutinyContextPolicyServiceGrpc.java
+++ b/src/policy/target/generated-sources/grpc/context_policy/MutinyContextPolicyServiceGrpc.java
@@ -8,7 +8,7 @@ import static io.grpc.stub.ServerCalls.asyncBidiStreamingCall;
 
 @javax.annotation.Generated(
 value = "by Mutiny Grpc generator",
-comments = "Source: context-policy.proto")
+comments = "Source: context_policy.proto")
 public final class MutinyContextPolicyServiceGrpc implements io.quarkus.grpc.runtime.MutinyGrpc {
     private MutinyContextPolicyServiceGrpc() {}
 
diff --git a/src/policy/target/generated-sources/grpc/policy/Policy.java b/src/policy/target/generated-sources/grpc/policy/Policy.java
index 541f97f47bd2e69711a795dc454841054e865a3a..08ce14adab068743fd26f031a82ec5fd56693c09 100644
--- a/src/policy/target/generated-sources/grpc/policy/Policy.java
+++ b/src/policy/target/generated-sources/grpc/policy/Policy.java
@@ -9387,7 +9387,7 @@ public final class Policy {
   static {
     java.lang.String[] descriptorData = {
       "\n\014policy.proto\022\006policy\032\rcontext.proto\032\026p" +
-      "olicy-condition.proto\032\023policy-action.pro" +
+      "olicy_condition.proto\032\023policy_action.pro" +
       "to\"+\n\014PolicyRuleId\022\033\n\004uuid\030\001 \001(\0132\r.conte" +
       "xt.Uuid\"=\n\017PolicyRuleState\022*\n\017policyRule" +
       "State\030\001 \001(\0162\021.policy.RuleState\"\225\002\n\017Polic" +
diff --git a/src/policy/target/generated-sources/grpc/policy/PolicyAction.java b/src/policy/target/generated-sources/grpc/policy/PolicyAction.java
index 1baaf538dc031be9443984f640826ccd893290e4..ea6ee17d03fecab1e341cdfbc97d5dd5f3b2576c 100644
--- a/src/policy/target/generated-sources/grpc/policy/PolicyAction.java
+++ b/src/policy/target/generated-sources/grpc/policy/PolicyAction.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: policy-action.proto
+// source: policy_action.proto
 
 package policy;
 
@@ -907,7 +907,7 @@ public final class PolicyAction {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\023policy-action.proto\022\006policy\"T\n\020PolicyR" +
+      "\n\023policy_action.proto\022\006policy\"T\n\020PolicyR" +
       "uleAction\022,\n\006action\030\001 \001(\0162\034.policy.Polic" +
       "yRuleActionEnum\022\022\n\nparameters\030\002 \003(\t*\274\001\n\024" +
       "PolicyRuleActionEnum\022\037\n\033POLICYRULE_ACTIO" +
diff --git a/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java b/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java
index 2bde987ea6b48fa4a5285775a235d26892ee3b81..ecd7192778b6f5e7d0f7ee8f189565c828860c21 100644
--- a/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java
+++ b/src/policy/target/generated-sources/grpc/policy/PolicyCondition.java
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: policy-condition.proto
+// source: policy_condition.proto
 
 package policy;
 
@@ -1325,7 +1325,7 @@ public final class PolicyCondition {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026policy-condition.proto\022\006policy\032\020monito" +
+      "\n\026policy_condition.proto\022\006policy\032\020monito" +
       "ring.proto\"\225\001\n\023PolicyRuleCondition\022 \n\005kp" +
       "iId\030\001 \001(\0132\021.monitoring.KpiId\0224\n\021numerica" +
       "lOperator\030\002 \001(\0162\031.policy.NumericalOperat" +
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index 5af647628b4e2e24a566865502d355afb98550c2..b3313f771654e02f80bb7e4cadf68476afcadc75 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -3,20 +3,23 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.quarkus.io/commit-id: e8b83d84e122dbca908952148fffda42dd975765
-    app.quarkus.io/build-timestamp: 2022-07-28 - 09:50:15 +0000
+    app.quarkus.io/commit-id: a25756b932a3146d95a993cf529e26e48654455e
+    app.quarkus.io/build-timestamp: 2022-08-01 - 12:51:14 +0000
   labels:
     app.kubernetes.io/name: policyservice
     app: policyservice
   name: policyservice
 spec:
   ports:
-    - name: grpc
+    - name: grpc-server
       port: 6060
       targetPort: 6060
     - name: http
       port: 8080
       targetPort: 8080
+    - name: grpc
+      port: 6060
+      targetPort: 6060
   selector:
     app.kubernetes.io/name: policyservice
   type: ClusterIP
@@ -25,8 +28,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.quarkus.io/commit-id: e8b83d84e122dbca908952148fffda42dd975765
-    app.quarkus.io/build-timestamp: 2022-07-28 - 09:50:15 +0000
+    app.quarkus.io/commit-id: a25756b932a3146d95a993cf529e26e48654455e
+    app.quarkus.io/build-timestamp: 2022-08-01 - 12:51:14 +0000
   labels:
     app: policyservice
     app.kubernetes.io/name: policyservice
@@ -39,8 +42,8 @@ spec:
   template:
     metadata:
       annotations:
-        app.quarkus.io/commit-id: e8b83d84e122dbca908952148fffda42dd975765
-        app.quarkus.io/build-timestamp: 2022-07-28 - 09:50:15 +0000
+        app.quarkus.io/commit-id: a25756b932a3146d95a993cf529e26e48654455e
+        app.quarkus.io/build-timestamp: 2022-08-01 - 12:51:14 +0000
       labels:
         app: policyservice
         app.kubernetes.io/name: policyservice
@@ -51,12 +54,12 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: CONTEXT_SERVICE_HOST
-              value: contextservice
-            - name: SERVICE_SERVICE_HOST
-              value: serviceservice
             - name: MONITORING_SERVICE_HOST
               value: monitoringservice
+            - name: SERVICE_SERVICE_HOST
+              value: serviceservice
+            - name: CONTEXT_SERVICE_HOST
+              value: contextservice
           image: registry.gitlab.com/teraflow-h2020/controller/policy:0.1.0
           imagePullPolicy: Always
           livenessProbe:
@@ -72,11 +75,14 @@ spec:
           name: policyservice
           ports:
             - containerPort: 6060
-              name: grpc
+              name: grpc-server
               protocol: TCP
             - containerPort: 8080
               name: http
               protocol: TCP
+            - containerPort: 6060
+              name: grpc
+              protocol: TCP
           readinessProbe:
             failureThreshold: 3
             httpGet: