diff --git a/src/policy/src/main/resources/application.yml b/src/policy/src/main/resources/application.yml
index 0f6f45931797c4ae53fd935aae1454db93e70de4..9ccfae3aaca5b52b51664aaa55a6e45a24def1ee 100644
--- a/src/policy/src/main/resources/application.yml
+++ b/src/policy/src/main/resources/application.yml
@@ -17,7 +17,7 @@ quarkus:
     path: teraflow-policy-banner.txt
   grpc:
     server:
-      port: 9999
+      port: 6060
       enable-reflection-service: true
     clients:
       context:
@@ -55,8 +55,8 @@ quarkus:
         host-port: 8080
         container-port: 8080
       grpc-server:
-        host-port: 9999
-        container-port: 9999
+        host-port: 6060
+        container-port: 6060
     env:
       vars:
         context-service-host: "contextservice"
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index f63ffbc0972cb7cac17346956488a52f4e694e08..c002153bf11635a83a80648b828c6c7fad0acbb9 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -3,20 +3,20 @@ apiVersion: v1
 kind: Service
 metadata:
   annotations:
-    app.quarkus.io/commit-id: fa8ec6157a3cde9fcea029558241850993a6ab5a
-    app.quarkus.io/build-timestamp: 2022-07-11 - 13:58:36 +0000
+    app.quarkus.io/commit-id: 665bca2f1245843e8c99eaa1a2c5315a6c002417
+    app.quarkus.io/build-timestamp: 2022-07-13 - 10:42:51 +0000
   labels:
     app.kubernetes.io/name: policyservice
     app: policyservice
   name: policyservice
 spec:
   ports:
+    - name: grpc-server
+      port: 6060
+      targetPort: 6060
     - name: http
       port: 8080
       targetPort: 8080
-    - name: grpc-server
-      port: 9999
-      targetPort: 9999
   selector:
     app.kubernetes.io/name: policyservice
   type: ClusterIP
@@ -25,8 +25,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.quarkus.io/commit-id: fa8ec6157a3cde9fcea029558241850993a6ab5a
-    app.quarkus.io/build-timestamp: 2022-07-11 - 13:58:36 +0000
+    app.quarkus.io/commit-id: 665bca2f1245843e8c99eaa1a2c5315a6c002417
+    app.quarkus.io/build-timestamp: 2022-07-13 - 10:42:51 +0000
   labels:
     app: policyservice
     app.kubernetes.io/name: policyservice
@@ -39,8 +39,8 @@ spec:
   template:
     metadata:
       annotations:
-        app.quarkus.io/commit-id: fa8ec6157a3cde9fcea029558241850993a6ab5a
-        app.quarkus.io/build-timestamp: 2022-07-11 - 13:58:36 +0000
+        app.quarkus.io/commit-id: 665bca2f1245843e8c99eaa1a2c5315a6c002417
+        app.quarkus.io/build-timestamp: 2022-07-13 - 10:42:51 +0000
       labels:
         app: policyservice
         app.kubernetes.io/name: policyservice
@@ -51,10 +51,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-            - name: SERVICE_SERVICE_HOST
-              value: serviceservice
             - name: CONTEXT_SERVICE_HOST
               value: contextservice
+            - name: SERVICE_SERVICE_HOST
+              value: serviceservice
             - name: MONITORING_SERVICE_HOST
               value: monitoringservice
           image: registry.gitlab.com/teraflow-h2020/controller/policy:0.1.0
@@ -71,12 +71,12 @@ spec:
             timeoutSeconds: 10
           name: policyservice
           ports:
+            - containerPort: 6060
+              name: grpc-server
+              protocol: TCP
             - containerPort: 8080
               name: http
               protocol: TCP
-            - containerPort: 9999
-              name: grpc-server
-              protocol: TCP
           readinessProbe:
             failureThreshold: 3
             httpGet: