diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 4ed31f2b..0892cc94 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -822,15 +822,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
-            </outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
         <!-- Copying thrift-authentication.xml -->
         <file>
             <source>src/repository/conf/application-authenticators.xml</source>
@@ -851,6 +842,12 @@
             </outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/repository/conf/identity/application-authentication.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity
+            </outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
         <file>
             <source>src/repository/conf/identity/thrift-authentication.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
diff --git a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
index 2139b873..873810cf 100644
--- a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
+++ b/modules/core/distribution/src/repository/conf/identity/application-authentication.xml
@@ -29,8 +29,8 @@
         AuthenticationEndpointURL is location of the web app containing
         the authentication related pages
     -->
-    <AuthenticationEndpointURL>https://${carbon.host}:${carbon.management.port}/devicemgt/login</AuthenticationEndpointURL>
-    <AuthenticationEndpointRetryURL>https://${carbon.host}:${carbon.management.port}/devicemgt/login?retry=true</AuthenticationEndpointRetryURL>
+    <AuthenticationEndpointURL>/devicemgt/login</AuthenticationEndpointURL>
+    <AuthenticationEndpointRetryURL>/authenticationendpoint/retry.do</AuthenticationEndpointRetryURL>
 
     <!--
         Extensions allow extending the default behaviour of the authentication