diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 8ca6b0f..b2cbe7f 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -189,10 +189,10 @@
                 cps: INFO
 ncmp:
     policy-executor:
-        enabled: false
+        enabled: ${POLICY_SERVICE_ENABLED:false}
         server:
-            address: http://localhost
-            port: 8785
+            address: ${POLICY_SERVICE_URL:http://policy-executor-stub}
+            port: ${POLICY_SERVICE_PORT:8093}
         httpclient:
             all-services:
                 maximumInMemorySizeInMegabytes: 16