diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2 b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2
index 19feedc4b1..28b00241af 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2
@@ -64,7 +64,7 @@
         {% else %}
         <ServerUrl>https://localhost:9443</ServerUrl>
         <AdminUsername>${admin.username}</AdminUsername>
-        <AdminPassword>${admin.username}</AdminPassword>
+        <AdminPassword>${admin.password}</AdminPassword>
         {% endif %}
     </IdentityConfiguration>
     <KeyManagerConfiguration>
@@ -75,7 +75,7 @@
         {% else %}
         <ServerUrl>https://localhost:9443</ServerUrl>
         <AdminUsername>${admin.username}</AdminUsername>
-        <AdminPassword>${admin.username}</AdminPassword>
+        <AdminPassword>${admin.password}</AdminPassword>
         {% endif %}
     </KeyManagerConfiguration>
     <PolicyConfiguration>
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2 b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2
index 631307ad2c..051e27206e 100644
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2
+++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2
@@ -95,7 +95,7 @@
                 <Parameter Name="IsRemote">false</Parameter>
                 <Parameter Name="TokenValidationEndpointUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</Parameter>
                 <Parameter Name="Username">${admin.username}</Parameter>
-                <Parameter Name="Password">${admin.username}</Parameter>
+                <Parameter Name="Password">${admin.password}</Parameter>
                 <Parameter Name="MaxTotalConnections">100</Parameter>
                 <Parameter Name="MaxConnectionsPerHost">100</Parameter>
             </Parameters>