diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
index 12ac0f19..7e25c013 100644
--- a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
+++ b/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
@@ -1,8 +1,8 @@
 <api xmlns="http://ws.apache.org/ns/synapse" name="_WSO2APIRegistrationApplication_" context="/api-application-registration">
     <resource methods="POST" url-mapping="/register/tenants" faultSequence="_api_registration_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.core.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">
@@ -20,8 +20,8 @@
     </resource>
     <resource methods="POST" url-mapping="/register" faultSequence="_api_registration_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.core.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">
@@ -39,8 +39,8 @@
     </resource>
     <resource methods="DELETE" url-mapping="/unregister" faultSequence="_api_registration_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.core.https.port')"/>
+            <property name="uri.var.hostname" expression="get-property('system','iot.core.host')"/>
             <send>
                 <endpoint>
                     <http uri-template="https://{uri.var.hostname}:{uri.var.portnum}/api-application-registration">