diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
index 4221f0c2..571c5b61 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMAuthorizeAPI_" context="/authorize">
     <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/authorize">
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
index 8c5fc818..f227eecf 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMRevokeAPI_" context="/revoke">
     <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/revoke">
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml
index 43268da1..74a0315b 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMTokenAPI_" context="/token">
     <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+	    <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                      <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/token">
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
index e8c32195..3e649879 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMUserInfoAPI_" context="/userinfo">
     <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/userinfo">
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml
index 4221f0c2..458007b8 100644
--- a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml
+++ b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMAuthorizeAPI_" context="/authorize">
     <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/authorize">
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml
index 8c5fc818..f227eecf 100644
--- a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml
+++ b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?><api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMRevokeAPI_" context="/revoke">
     <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/revoke">
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml
index 43268da1..eb85c584 100644
--- a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml
+++ b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMTokenAPI_" context="/token">
     <resource methods="POST" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                      <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/token">
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml
index e8c32195..3e649879 100644
--- a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml
+++ b/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2AMUserInfoAPI_" context="/userinfo">
     <resource methods="GET" url-mapping="/*" faultSequence="_token_fault_">
         <inSequence>
-            <property name="uri.var.portnum" expression="get-property('keyManager.port')"/>
-	    <property name="uri.var.hostname" expression="get-property('keyManager.hostname')"/>
+            <property name="uri.var.portnum" expression="get-property('system','iot.keymanager.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.keymanager.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/oauth2/userinfo">