diff --git a/policy-agent/config/application.yaml b/policy-agent/config/application.yaml
index f0fa3a0..5416a4d 100644
--- a/policy-agent/config/application.yaml
+++ b/policy-agent/config/application.yaml
@@ -20,10 +20,6 @@
     org.oransc.policyagent: INFO
   file: /var/log/policy-agent/application.log
 app:
-  filepath: /opt/app/policy-agent/config/application_configuration.json
-  a1ControllerBaseUrl: http://sdnc.onap:8282
-  a1ControllerUsername: admin
-  a1ControllerPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
+  filepath: /opt/app/policy-agent/config/application_configuration.json  
 server:
    port : 8081
diff --git a/policy-agent/config/application_configuration.json b/policy-agent/config/application_configuration.json
index 8f3f80b..6c21b16 100644
--- a/policy-agent/config/application_configuration.json
+++ b/policy-agent/config/application_configuration.json
@@ -1,10 +1,19 @@
 {
    "config": {
       "//description": "Application configuration",
+      "controller": [
+         {
+            "name": "controller1",
+            "baseUrl": "http://a1controller:8282",
+            "userName": "admin",
+            "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+         }
+      ],
       "ric": [
          {
             "name": "ric1",
             "baseUrl": "http://ric1:8085/",
+            "controller": "controller1",
             "managedElementIds": [
                "kista_1",
                "kista_2"