diff --git a/src/policy/src/main/resources/application.yml b/src/policy/src/main/resources/application.yml
index 2e09b2302d0311d06a36f3ee262e2a7a900c1ddc..0f6f45931797c4ae53fd935aae1454db93e70de4 100644
--- a/src/policy/src/main/resources/application.yml
+++ b/src/policy/src/main/resources/application.yml
@@ -19,6 +19,17 @@ quarkus:
     server:
       port: 9999
       enable-reflection-service: true
+    clients:
+      context:
+        host: ${quarkus.kubernetes.env.vars.context-service-host}
+        port: 1010
+      monitoring:
+        host: ${quarkus.kubernetes.env.vars.monitoring-service-host}
+        port: 7070
+      service:
+        host: ${quarkus.kubernetes.env.vars.service-service-host}
+        port: 3030
+
   http:
     port: 8080
 
@@ -46,3 +57,9 @@ quarkus:
       grpc-server:
         host-port: 9999
         container-port: 9999
+    env:
+      vars:
+        context-service-host: "contextservice"
+        monitoring-service-host: "monitoringservice"
+        service-service-host: "serviceservice"
+
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index 3625e9d859ea0a58fc1aff47eeab15cb0434ff03..462e59696da4ce667471d6979824a148b3f96b7a 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: 54b760b9045db694a08b0f291f52b28aa4d8c5d2
-    app.quarkus.io/build-timestamp: 2022-05-23 - 13:57:10 +0000
+    app.quarkus.io/commit-id: 2aa29b383ec7bf12dc985729978210239ea8a726
+    app.quarkus.io/build-timestamp: 2022-07-07 - 10:19:44 +0000
   labels:
     app.kubernetes.io/name: policyservice
     app: policyservice
@@ -25,8 +25,8 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    app.quarkus.io/commit-id: 54b760b9045db694a08b0f291f52b28aa4d8c5d2
-    app.quarkus.io/build-timestamp: 2022-05-23 - 13:57:10 +0000
+    app.quarkus.io/commit-id: 2aa29b383ec7bf12dc985729978210239ea8a726
+    app.quarkus.io/build-timestamp: 2022-07-07 - 10:19:44 +0000
   labels:
     app: policyservice
     app.kubernetes.io/name: policyservice
@@ -39,8 +39,8 @@ spec:
   template:
     metadata:
       annotations:
-        app.quarkus.io/commit-id: 54b760b9045db694a08b0f291f52b28aa4d8c5d2
-        app.quarkus.io/build-timestamp: 2022-05-23 - 13:57:10 +0000
+        app.quarkus.io/commit-id: 2aa29b383ec7bf12dc985729978210239ea8a726
+        app.quarkus.io/build-timestamp: 2022-07-07 - 10:19:44 +0000
       labels:
         app: policyservice
         app.kubernetes.io/name: policyservice
@@ -51,6 +51,12 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
+            - 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: