diff --git a/distribution/pom.xml b/distribution/pom.xml
index e1cd5b1..f5f48e3 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,13 +1,13 @@
 <?org.wso2.uesxml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.community.uem</groupId>
         <artifactId>io.entgra.community.uem.parent</artifactId>
-        <version>5.2.2-SNAPSHOT</version>
+        <version>6.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/distribution/uem-community/pom.xml b/distribution/uem-community/pom.xml
index 8fcdb57..db03b12 100644
--- a/distribution/uem-community/pom.xml
+++ b/distribution/uem-community/pom.xml
@@ -1,13 +1,13 @@
 <?org.wso2.uesxml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.community.uem</groupId>
         <artifactId>distribution</artifactId>
-        <version>5.2.2-SNAPSHOT</version>
+        <version>6.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/distribution/uem-community/src/assembly/bin.xml b/distribution/uem-community/src/assembly/bin.xml
index 60501bc..0014ec9 100644
--- a/distribution/uem-community/src/assembly/bin.xml
+++ b/distribution/uem-community/src/assembly/bin.xml
@@ -1,12 +1,12 @@
 <!--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
diff --git a/p2-profile/pom.xml b/p2-profile/pom.xml
index e8e68a2..3801184 100644
--- a/p2-profile/pom.xml
+++ b/p2-profile/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.community.uem</groupId>
         <artifactId>io.entgra.community.uem.parent</artifactId>
-        <version>5.2.2-SNAPSHOT</version>
+        <version>6.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index d8edc38..56530bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
@@ -23,7 +23,7 @@
     <groupId>io.entgra.community.uem</groupId>
     <artifactId>io.entgra.community.uem.parent</artifactId>
     <packaging>pom</packaging>
-    <version>5.2.2-SNAPSHOT</version>
+    <version>6.0.1-SNAPSHOT</version>
     <name>Entgra Community Product - Parent</name>
     <url>https://entgra.io</url>
     <description>Entgra Community Product</description>
@@ -78,14 +78,14 @@
         <entgra-uem-community>entgra-uem-community-${project.version}</entgra-uem-community>
 
         <!-- Carbon Device Management-->
-        <io.entgra.device.mgt.core.version>5.0.26-SNAPSHOT</io.entgra.device.mgt.core.version>
+        <io.entgra.device.mgt.core.version>5.0.42-SNAPSHOT</io.entgra.device.mgt.core.version>
 
         <carbon.p2.plugin.version>5.2.42</carbon.p2.plugin.version>
 
         <!--Orbit versions-->
         <orbit.h2.version>2.1.210.wso2v1</orbit.h2.version>
 
-        <io.entgra.device.mgt.plugins.version>6.0.17-SNAPSHOT</io.entgra.device.mgt.plugins.version>
+        <io.entgra.device.mgt.plugins.version>6.0.30-SNAPSHOT</io.entgra.device.mgt.plugins.version>
 
         <!--Testing-->
         <google.gson.version>2.9.1</google.gson.version>
diff --git a/uem-core/pom.xml b/uem-core/pom.xml
index fe8ac7c..c0df5da 100644
--- a/uem-core/pom.xml
+++ b/uem-core/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.community.uem</groupId>
         <artifactId>io.entgra.community.uem.parent</artifactId>
-        <version>5.2.2-SNAPSHOT</version>
+        <version>6.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/uem-core/src/assembly/bin.xml b/uem-core/src/assembly/bin.xml
index 38bbf11..30cb3ec 100644
--- a/uem-core/src/assembly/bin.xml
+++ b/uem-core/src/assembly/bin.xml
@@ -1,12 +1,12 @@
 <!--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
diff --git a/uem-core/src/core/resources/extensions/basicauth.jsp b/uem-core/src/core/resources/extensions/basicauth.jsp
index e754273..53ca56d 100644
--- a/uem-core/src/core/resources/extensions/basicauth.jsp
+++ b/uem-core/src/core/resources/extensions/basicauth.jsp
@@ -1,12 +1,12 @@
 <%--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing,
   ~ software distributed under the License is distributed on an
diff --git a/uem-core/src/core/resources/extensions/cookie-policy-content.jsp b/uem-core/src/core/resources/extensions/cookie-policy-content.jsp
index 81bea64..37390c8 100644
--- a/uem-core/src/core/resources/extensions/cookie-policy-content.jsp
+++ b/uem-core/src/core/resources/extensions/cookie-policy-content.jsp
@@ -1,5 +1,5 @@
 <%--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/uem-core/src/core/resources/extensions/header.jsp b/uem-core/src/core/resources/extensions/header.jsp
index 0bb4d1e..d592c77 100644
--- a/uem-core/src/core/resources/extensions/header.jsp
+++ b/uem-core/src/core/resources/extensions/header.jsp
@@ -1,4 +1,3 @@
-
 <%--
   ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
   ~
diff --git a/uem-core/src/core/resources/extensions/privacy-policy-content.jsp b/uem-core/src/core/resources/extensions/privacy-policy-content.jsp
index 4cda482..0001f08 100644
--- a/uem-core/src/core/resources/extensions/privacy-policy-content.jsp
+++ b/uem-core/src/core/resources/extensions/privacy-policy-content.jsp
@@ -1,5 +1,5 @@
 <%--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/uem-core/src/core/resources/extensions/product-title.jsp b/uem-core/src/core/resources/extensions/product-title.jsp
index a29d3c5..bba2ff8 100644
--- a/uem-core/src/core/resources/extensions/product-title.jsp
+++ b/uem-core/src/core/resources/extensions/product-title.jsp
@@ -1,5 +1,5 @@
 <%--
-  ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
   ~
   ~ Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/uem-core/src/core/resources/extensions/title.jsp b/uem-core/src/core/resources/extensions/title.jsp
index b965202..c2af936 100644
--- a/uem-core/src/core/resources/extensions/title.jsp
+++ b/uem-core/src/core/resources/extensions/title.jsp
@@ -1,4 +1,3 @@
- 
 <%--
   ~ Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
   ~
diff --git a/uem-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties b/uem-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties
index 5bec6e6..c3e8971 100644
--- a/uem-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties
+++ b/uem-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources.properties
@@ -1,12 +1,12 @@
 #
-# Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+# Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
 #
 # Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
diff --git a/uem-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties b/uem-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties
index 3f229e1..1688890 100644
--- a/uem-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties
+++ b/uem-core/src/core/resources/org/wso2/carbon/identity/application/authentication/endpoint/i18n/Resources_fr_FR.properties
@@ -1,12 +1,12 @@
 #
-# Copyright (c) 2018-2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
+# Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://entgra.io) All Rights Reserved.
 #
 # Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an