diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index b3d61fc0c71..a6cb73c470b 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -14,13 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -28,7 +27,7 @@
     <artifactId>wso2is</artifactId>
     <packaging>jar</packaging>
     <name>Identity Server</name>
-    <url></url>
+    <url />
     <description>Identity Server: Distribution</description>
 
     <dependencies>
@@ -61,8 +60,7 @@
               <version>${carbon.version}</version> </dependency> <dependency>
               <groupId>org.wso2.carbon</groupId>
               <artifactId>com.wso2.carbon.multitenancy.theme.mgt</artifactId>
-              <version>${carbon.version}</version > </dependency
-          -->
+              <version>${carbon.version}</version > </dependency -->
 
     </dependencies>
 
@@ -107,174 +105,77 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <property name="tempdir" value="target/docs-temp"/>
-                                <property name="registryPolicyHandler"
-                                          value="&lt;handler class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler&quot;&gt;${line.separator}       &lt;filter class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyMediaTypeMatcher&quot;&gt;${line.separator}           &lt;property name=&quot;mediaType&quot;&gt;application/xacml-policy+xml&lt;/property&gt;${line.separator}       &lt;/filter&gt;${line.separator}   &lt;/handler&gt;${line.separator}${line.separator}   &lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;"/>
+                                <property name="tempdir" value="target/docs-temp" />
+                                <property name="registryPolicyHandler" value="&lt;handler class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler&quot;&gt;${line.separator}       &lt;filter class=&quot;org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyMediaTypeMatcher&quot;&gt;${line.separator}           &lt;property name=&quot;mediaType&quot;&gt;application/xacml-policy+xml&lt;/property&gt;${line.separator}       &lt;/filter&gt;${line.separator}   &lt;/handler&gt;${line.separator}${line.separator}   &lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;" />
 
-                                <mkdir dir="${tempdir}"/>
+                                <mkdir dir="${tempdir}" />
                                 <unzip dest="${tempdir}">
                                     <fileset dir="target">
-                                        <include name="wso2is-${project.version}.zip"/>
+                                        <include name="wso2is-${project.version}.zip" />
                                     </fileset>
                                 </unzip>
 
                                 <!--unzip src="wso2is-${project.version}.zip" dest="${tempdir}">
                                 </unzip-->
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="${product.name}" value="WSO2 Identity Server"/>
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml"
-                                        token="&lt;Context crossContext=&quot;true&quot;&gt;"
-                                        value="&lt;Context crossContext=&quot;true&quot; useHttpOnly=&quot;true&quot;&gt;"/>
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;ServerURL&gt;https://${carbon.local.ip}"
-                                        value="&lt;ServerURL&gt;https://localhost"/>
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;!--MgtHostName&gt;mgt.wso2.org&lt;/MgtHostName--&gt;"
-                                        value="&lt;MgtHostName&gt;localhost&lt;/MgtHostName&gt;"/>
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;!--HostName&gt;www.wso2.org&lt;/HostName--&gt;"
-                                        value="&lt;HostName&gt;localhost&lt;/HostName&gt;"/>
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;!--LdapServer&gt;"
-                                        value="&lt;LdapServer&gt;"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;/LdapServer--&gt;"
-                                        value="&lt;/LdapServer&gt;"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;!--TokenStoreClassName&gt;"
-                                        value="&lt;TokenStoreClassName&gt;"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml"
-                                        token="&lt;/TokenStoreClassName--&gt;"
-                                        value="&lt;/TokenStoreClassName&gt;"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="${product.name}" value="WSO2 Identity Server" />
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml" token="&lt;Context crossContext=&quot;true&quot;&gt;" value="&lt;Context crossContext=&quot;true&quot; useHttpOnly=&quot;true&quot;&gt;" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;ServerURL&gt;https://${carbon.local.ip}" value="&lt;ServerURL&gt;https://localhost" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--MgtHostName&gt;mgt.wso2.org&lt;/MgtHostName--&gt;" value="&lt;MgtHostName&gt;localhost&lt;/MgtHostName&gt;" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--HostName&gt;www.wso2.org&lt;/HostName--&gt;" value="&lt;HostName&gt;localhost&lt;/HostName&gt;" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--LdapServer&gt;" value="&lt;LdapServer&gt;" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;/LdapServer--&gt;" value="&lt;/LdapServer&gt;" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;!--TokenStoreClassName&gt;" value="&lt;TokenStoreClassName&gt;" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml" token="&lt;/TokenStoreClassName--&gt;" value="&lt;/TokenStoreClassName&gt;" />
 
                                 <!-- Update log4j.properties file with Identity related log files -->
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties"
-                                        token="log4j.logger.net.sf.ehcache.config.ConfigurationFactory=ERROR"
-                                        value="log4j.logger.net.sf.ehcache=ERROR${line.separator}
-#log4j.logger.org.wso2.carbon.user.core=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.sso.saml=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.application=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.application.authentication.framework=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.mgt=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.oauth2=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.scim=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.mgt=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.idp.mgt=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.provisioning=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.user.account.association=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.user.profile.mgt=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.security=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.sso.agent=DEBUG${line.separator}
-#log4j.logger.org.wso2.carbon.identity.core=DEBUG"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties"
-                                        token="log4j.appender.CARBON_MEMORY=org.wso2.carbon.utils.logging.appenders.MemoryAppender"
-                                        value="log4j.appender.CARBON_MEMORY=org.wso2.carbon.logging.service.appender.CarbonMemoryAppender"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties"
-                                        token="log4j.appender.CARBON_MEMORY.layout=org.apache.log4j.PatternLayout"
-                                        value="log4j.appender.CARBON_MEMORY.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties"
-                                        token="log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n"
-                                        value="log4j.appender.CARBON_MEMORY.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n${line.separator}log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S]${line.separator}log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.logger.net.sf.ehcache.config.ConfigurationFactory=ERROR" value="log4j.logger.net.sf.ehcache=ERROR${line.separator} #log4j.logger.org.wso2.carbon.user.core=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.sso.saml=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.application=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.application.authentication.framework=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.mgt=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.oauth2=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.scim=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.mgt=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.idp.mgt=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.provisioning=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.user.account.association=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.user.profile.mgt=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.security=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.sso.agent=DEBUG${line.separator} #log4j.logger.org.wso2.carbon.identity.core=DEBUG" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.appender.CARBON_MEMORY=org.wso2.carbon.utils.logging.appenders.MemoryAppender" value="log4j.appender.CARBON_MEMORY=org.wso2.carbon.logging.service.appender.CarbonMemoryAppender" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.appender.CARBON_MEMORY.layout=org.apache.log4j.PatternLayout" value="log4j.appender.CARBON_MEMORY.layout=org.wso2.carbon.utils.logging.TenantAwarePatternLayout" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/log4j.properties" token="log4j.appender.CARBON_MEMORY.layout.ConversionPattern=[%d] %5p {%c} - %x %m %n" value="log4j.appender.CARBON_MEMORY.layout.ConversionPattern=TID: [%T] [%S] [%d] %P%5p {%c} - %x %m {%c}%n${line.separator}log4j.appender.CARBON_MEMORY.layout.TenantPattern=%U%@%D [%T] [%S]${line.separator}log4j.appender.CARBON_MEMORY.columnList=%T,%S,%A,%d,%c,%p,%m,%H,%I,%Stacktrace" />
 
                                 <!-- Comment all active UserStoreManagers -->
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                        token="&lt;UserStoreManager"
-                                        value="&lt;!--UserStoreManager"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                        token="&lt;/UserStoreManager&gt;"
-                                        value="&lt;/UserStoreManager--&gt;"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                        token="&lt;!--ISUserStoreManager"
-                                        value="&lt;UserStoreManager"/>
-
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                        token="&lt;/ISUserStoreManager--&gt;"
-                                        value="&lt;/UserStoreManager&gt;"/>
-
-                               <replace
-                                       file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml"
-                                       token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;"
-                                       value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml"
-                                        token="&lt;!--ServiceProvider&gt;"
-                                        value="&lt;ServiceProvider&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml"
-                                        token="&lt;Issuer&gt;&lt;/Issuer&gt;"
-                                        value="&lt;Issuer&gt;wso2.my.dashboard&lt;/Issuer&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml"
-                                        token="&lt;AssertionConsumerServiceURL&gt;&lt;/AssertionConsumerServiceURL&gt;"
-                                        value="&lt;AssertionConsumerServiceURL&gt;https://localhost:9443/dashboard/acs&lt;/AssertionConsumerServiceURL&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml"
-                                        token="&lt;DefaultAssertionConsumerServiceURL&gt;&lt;/DefaultAssertionConsumerServiceURL&gt;"
-                                        value="&lt;DefaultAssertionConsumerServiceURL&gt;https://localhost:9443/dashboard/acs&lt;/DefaultAssertionConsumerServiceURL&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml"
-                                        token="&lt;SignAssertion&gt;false&lt;/SignAssertion&gt;"
-                                        value="&lt;SignAssertion&gt;true&lt;/SignAssertion&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml"
-                                        token="&lt;SignResponse&gt;false&lt;/SignResponse&gt;"
-                                        value="&lt;SignResponse&gt;true&lt;/SignResponse&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml"
-                                        token="&lt;EnableAudienceRestriction&gt;false&lt;/EnableAudienceRestriction&gt;"
-                                        value="&lt;EnableAudienceRestriction&gt;true&lt;/EnableAudienceRestriction&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml"
-                                        token="&lt;Audience&gt;&lt;/Audience&gt;"
-                                        value="&lt;Audience&gt;carbonServer&lt;/Audience&gt;"/>
-
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml"
-                                        token="&lt;/ServiceProvider--&gt;"
-                                        value="&lt;/ServiceProvider&gt;"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;UserStoreManager" value="&lt;!--UserStoreManager" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;/UserStoreManager&gt;" value="&lt;/UserStoreManager--&gt;" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;!--ISUserStoreManager" value="&lt;UserStoreManager" />
+
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;/ISUserStoreManager--&gt;" value="&lt;/UserStoreManager&gt;" />
+
+                               <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml" token="&lt;!--ServiceProvider&gt;" value="&lt;ServiceProvider&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml" token="&lt;Issuer&gt;&lt;/Issuer&gt;" value="&lt;Issuer&gt;wso2.my.dashboard&lt;/Issuer&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml" token="&lt;AssertionConsumerServiceURL&gt;&lt;/AssertionConsumerServiceURL&gt;" value="&lt;AssertionConsumerServiceURL&gt;https://localhost:9443/dashboard/acs&lt;/AssertionConsumerServiceURL&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml" token="&lt;DefaultAssertionConsumerServiceURL&gt;&lt;/DefaultAssertionConsumerServiceURL&gt;" value="&lt;DefaultAssertionConsumerServiceURL&gt;https://localhost:9443/dashboard/acs&lt;/DefaultAssertionConsumerServiceURL&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml" token="&lt;SignAssertion&gt;false&lt;/SignAssertion&gt;" value="&lt;SignAssertion&gt;true&lt;/SignAssertion&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml" token="&lt;SignResponse&gt;false&lt;/SignResponse&gt;" value="&lt;SignResponse&gt;true&lt;/SignResponse&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml" token="&lt;EnableAudienceRestriction&gt;false&lt;/EnableAudienceRestriction&gt;" value="&lt;EnableAudienceRestriction&gt;true&lt;/EnableAudienceRestriction&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml" token="&lt;Audience&gt;&lt;/Audience&gt;" value="&lt;Audience&gt;carbonServer&lt;/Audience&gt;" />
+
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/sso-idp-config.xml" token="&lt;/ServiceProvider--&gt;" value="&lt;/ServiceProvider&gt;" />
 
                                 <unzip dest="${tempdir}/shindig">
                                     <fileset dir="../p2-profile-gen/target/wso2carbon-core-4.4.2/repository/deployment/server/webapps">
-                                        <include name="shindig.war"/>
+                                        <include name="shindig.war" />
                                     </fileset>
                                 </unzip>
 
-                                <delete file="../p2-profile-gen/target/wso2carbon-core-4.4.2/repository/deployment/server/webapps/shindig.war"/>
-                                <delete file="${tempdir}/shindig/WEB-INF/web.xml"/>
+                                <delete file="../p2-profile-gen/target/wso2carbon-core-4.4.2/repository/deployment/server/webapps/shindig.war" />
+                                <delete file="${tempdir}/shindig/WEB-INF/web.xml" />
 
                                 <copy todir="${tempdir}/shindig/WEB-INF" overwrite="false">
                                     <fileset dir="conf/shindig">
@@ -286,88 +187,67 @@
 
                                 <!-- Add org.wso2.carbon.identity.entitlement.policy.finder.registry.RegistryPolicyHandler to IS -->
 
-                                <replace
-                                        file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/registry.xml"
-                                        token="&lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;"
-                                        value="${registryPolicyHandler}"/>
+                                <replace file="../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/registry.xml" token="&lt;!--&lt;handler class=&quot;org.wso2.carbon.registry.extensions.handlers.SynapseRepositoryHandler&quot;&gt;" value="${registryPolicyHandler}" />
 
                                 <!-- Enable KDC for IS -->
 
-                                <copy
-                                        todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/"
-                                        overwrite="false">
-                                    <fileset
-                                            dir="${tempdir}/wso2is-${project.version}/repository/components/">
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/" overwrite="false">
+                                    <fileset dir="${tempdir}/wso2is-${project.version}/repository/components/">
                                     </fileset>
                                 </copy>
-                                <copy
-                                        todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/client/modules"
-                                        overwrite="false">
-                                    <fileset
-                                            dir="${tempdir}/wso2is-${project.version}/repository/deployment/client/modules">
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/client/modules" overwrite="false">
+                                    <fileset dir="${tempdir}/wso2is-${project.version}/repository/deployment/client/modules">
                                     </fileset>
                                 </copy>
-                                <copy
-                                        todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity"
-                                        overwrite="false">
-                                    <fileset
-                                            dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/">
+                                <copy todir="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity" overwrite="false">
+                                    <fileset dir="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/">
                                     </fileset>
                                 </copy>
 
                                 <path id="h2.classpath">
-                                    <path refid="maven.compile.classpath"/>
+                                    <path refid="maven.compile.classpath" />
                                 </path>
-                                <echo
-                                        message="########### Create Identity Database ##############"/>
-                                <sql
-                                        driver="org.h2.Driver"
-                                        url="jdbc:h2:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2CARBON_DB"
-                                        userid="wso2carbon" password="wso2carbon" autocommit="true"
-                                        onerror="continue">
+                                <echo message="########### Create Identity Database ##############" />
+                                <sql driver="org.h2.Driver" url="jdbc:h2:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2CARBON_DB" userid="wso2carbon" password="wso2carbon" autocommit="true" onerror="continue">
                                     <classpath>
-                                        <path refid="h2.classpath"/>
+                                        <path refid="h2.classpath" />
                                     </classpath>
-                                    <fileset
-                                            file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/h2.sql"/>
+                                    <fileset file="target/wso2carbon-core-${carbon.kernel.version}/dbscripts/identity/h2.sql" />
                                 </sql>
-                                <echo
-                                        message="##################### END ########################"/>
+                                <echo message="##################### END ########################" />
 
-                                <delete file="target/wso2is-${project.version}.zip"/>
-                                <delete dir="${tempdir}"/>
-                                <mkdir dir="${tempdir}"/>
+                                <delete file="target/wso2is-${project.version}.zip" />
+                                <delete dir="${tempdir}" />
+                                <mkdir dir="${tempdir}" />
                                 <unzip dest="${tempdir}">
-                                    <fileset
-                                            dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/">
-                                        <include name="*.ui*.jar"/>
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components/plugins/">
+                                        <include name="*.ui*.jar" />
                                     </fileset>
                                 </unzip>
                                 <move todir="${tempdir}/web/" includeemptydirs="false">
                                     <fileset dir="${tempdir}/web/">
-                                        <exclude name="**/yui/**"/>
-                                        <exclude name="**/ajax/**"/>
-                                        <exclude name="**/WEB-INF/**"/>
-                                        <include name="**/*.html"/>
-                                        <exclude name="**/editarea/**"/>
-                                        <exclude name="**/codepress/**"/>
+                                        <exclude name="**/yui/**" />
+                                        <exclude name="**/ajax/**" />
+                                        <exclude name="**/WEB-INF/**" />
+                                        <include name="**/*.html" />
+                                        <exclude name="**/editarea/**" />
+                                        <exclude name="**/codepress/**" />
                                     </fileset>
-                                    <mapper type="glob" from="*.html" to="*.xml"/>
+                                    <mapper type="glob" from="*.html" to="*.xml" />
                                 </move>
-                                <copy todir="src/site/xdoc" overwrite="false"
-                                      includeemptydirs="false">
+                                <copy todir="src/site/xdoc" overwrite="false" includeemptydirs="false">
                                     <fileset dir="${tempdir}/web">
-                                        <exclude name="**/yui/**"/>
-                                        <exclude name="**/ajax/**"/>
-                                        <exclude name="**/WEB-INF/**"/>
-                                        <exclude name="**/gadget/**"/>
-                                        <exclude name="**/*.html"/>
-                                        <exclude name="**/*.js"/>
-                                        <exclude name="**/*.jsp"/>
-                                        <exclude name="**/*.xsl"/>
-                                        <exclude name="*.*"/>
-                                        <exclude name="**/template.xml"/>
-                                        <exclude name="**/codepress.xml"/>
+                                        <exclude name="**/yui/**" />
+                                        <exclude name="**/ajax/**" />
+                                        <exclude name="**/WEB-INF/**" />
+                                        <exclude name="**/gadget/**" />
+                                        <exclude name="**/*.html" />
+                                        <exclude name="**/*.js" />
+                                        <exclude name="**/*.jsp" />
+                                        <exclude name="**/*.xsl" />
+                                        <exclude name="*.*" />
+                                        <exclude name="**/template.xml" />
+                                        <exclude name="**/codepress.xml" />
                                     </fileset>
                                 </copy>
                                 <copy todir="src/site" overwrite="false" includeemptydirs="false">
@@ -376,22 +256,22 @@
                                 </copy>
                                 <copy todir="src/site" overwrite="true" includeemptydirs="false">
                                     <fileset dir="../documentation/src/site">
-                                        <exclude name="**/images/*.*"/>
-                                        <exclude name="**/user-mgt-actdir.xml"/>
-                                        <exclude name="**/user-mgt-jdbc.xml"/>
-                                        <exclude name="**/user-mgt-ldap.xml"/>
-                                        <exclude name="**/user-mgt-ldap-read-write.xml"/>
+                                        <exclude name="**/images/*.*" />
+                                        <exclude name="**/user-mgt-actdir.xml" />
+                                        <exclude name="**/user-mgt-jdbc.xml" />
+                                        <exclude name="**/user-mgt-ldap.xml" />
+                                        <exclude name="**/user-mgt-ldap-read-write.xml" />
                                     </fileset>
                                     <filterset>
-                                        <filter token="buildNumber" value="${buildNumber}"/>
+                                        <filter token="buildNumber" value="${buildNumber}" />
                                     </filterset>
                                 </copy>
                                 <copy todir="target/site/" overwrite="false" includeemptydirs="false">
                                     <fileset dir="src/site/xdoc/">
-                                        <include name="**/images/*.*"/>
+                                        <include name="**/images/*.*" />
                                     </fileset>
                                 </copy>
-                                <delete dir="${tempdir}"/>
+                                <delete dir="${tempdir}" />
                             </tasks>
                         </configuration>
                     </execution>
@@ -403,14 +283,14 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <delete dir="target/archive-tmp"/>
-                                <delete dir="target/dependency-maven-plugin-markers"/>
-                                <delete dir="target/maven-archiver"/>
-                                <delete dir="target/wso2carbon-core-4.3.0"/>
-                                <delete file="target/wso2is-5.1.0.jar"/>
-                                <delete dir="target/sources"/>
-                                <delete dir="target/site"/>
-                                <delete dir="src/site"/>
+                                <delete dir="target/archive-tmp" />
+                                <delete dir="target/dependency-maven-plugin-markers" />
+                                <delete dir="target/maven-archiver" />
+                                <delete dir="target/wso2carbon-core-4.3.0" />
+                                <delete file="target/wso2is-5.1.0.jar" />
+                                <delete dir="target/sources" />
+                                <delete dir="target/site" />
+                                <delete dir="src/site" />
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/modules/features/org.wso2.identity.styles.feature/pom.xml b/modules/features/org.wso2.identity.styles.feature/pom.xml
index 509e0a55d1b..cd73cf32338 100644
--- a/modules/features/org.wso2.identity.styles.feature/pom.xml
+++ b/modules/features/org.wso2.identity.styles.feature/pom.xml
@@ -15,13 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.1.0-beta</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/org.wso2.identity.ui.feature/pom.xml b/modules/features/org.wso2.identity.ui.feature/pom.xml
index 677141fbc99..26c089419bf 100644
--- a/modules/features/org.wso2.identity.ui.feature/pom.xml
+++ b/modules/features/org.wso2.identity.ui.feature/pom.xml
@@ -15,14 +15,12 @@
  ~ limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.1.0-beta</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/org.wso2.identity.utils.feature/pom.xml b/modules/features/org.wso2.identity.utils.feature/pom.xml
index 78eeb362c41..85fe2d4e593 100644
--- a/modules/features/org.wso2.identity.utils.feature/pom.xml
+++ b/modules/features/org.wso2.identity.utils.feature/pom.xml
@@ -15,13 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
 		<groupId>org.wso2.is</groupId>
 		<artifactId>identity-features</artifactId>
-		<version>5.1.0-SNAPSHOT</version>
+		<version>5.1.0-beta</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index d03fc3c11b5..d45cea30474 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -12,13 +12,12 @@
 		limitations under the License.
 	-->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0-beta</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index cb6444c0002..27a24f29c03 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
index 31fcdf536eb..ebb162f7756 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
index 544eaf32c7b..210020a4043 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index 163eb5f25bb..333ab2347bd 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
index 37715e86e41..8e9a1857cbc 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index d6361131924..9960bf98c39 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml
index 844ac333fdd..d555bd38233 100644
--- a/modules/integration/tests-integration/tests-backend/pom.xml
+++ b/modules/integration/tests-integration/tests-backend/pom.xml
@@ -14,13 +14,11 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-integration-tests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -248,8 +246,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent/travelocity-app-build.xml"
-                                     target="clear-slf4j-libs"/>
+                                <ant antfile="src/test/resources/artifacts/IS/org.wso2.sample.is.sso.agent/travelocity-app-build.xml" target="clear-slf4j-libs" />
                             </tasks>
                         </configuration>
                         <goals>
@@ -261,18 +258,12 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml"
-                                     target="openid-smartconsumerwithclaims"/>
-                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml"
-                                     target="openid-smartconsumerwithoutclaims"/>
-                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml"
-                                     target="openid-dumbconsumerwithclaims"/>
-                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml"
-                                     target="openid-dumbconsumerwithoutclaims"/>
-                                <ant antfile="src/test/resources/artifacts/IS/oauth/oauth-app-build.xml"
-                                     target="default"/>
-                                <ant antfile="src/test/resources/artifacts/IS/passivests/sts-app-build.xml"
-                                     target="default"/>
+                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml" target="openid-smartconsumerwithclaims" />
+                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml" target="openid-smartconsumerwithoutclaims" />
+                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml" target="openid-dumbconsumerwithclaims" />
+                                <ant antfile="src/test/resources/artifacts/IS/openId/openid-app-build.xml" target="openid-dumbconsumerwithoutclaims" />
+                                <ant antfile="src/test/resources/artifacts/IS/oauth/oauth-app-build.xml" target="default" />
+                                <ant antfile="src/test/resources/artifacts/IS/passivests/sts-app-build.xml" target="default" />
                             </tasks>
                         </configuration>
                         <goals>
@@ -284,8 +275,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="src/test/resources/artifacts/IS/saml/saml-app-build.xml"
-                                     target="saml-tenant-signingdisabled"/>
+                                <ant antfile="src/test/resources/artifacts/IS/saml/saml-app-build.xml" target="saml-tenant-signingdisabled" />
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/modules/migration/migration-5.0.0_to_5.1.0/wso2-is-migration-client/pom.xml b/modules/migration/migration-5.0.0_to_5.1.0/wso2-is-migration-client/pom.xml
index b99d265f5c4..e4aaff87aab 100644
--- a/modules/migration/migration-5.0.0_to_5.1.0/wso2-is-migration-client/pom.xml
+++ b/modules/migration/migration-5.0.0_to_5.1.0/wso2-is-migration-client/pom.xml
@@ -14,14 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../../../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 8183650145e..b03f3a4f0d9 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -14,13 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>identity-server-parent</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -1731,14 +1730,10 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <replace token="false" value="true"
-                                         dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components">
-                                    <include name="**/bundles.info"/>
+                                <replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version}/repository/components">
+                                    <include name="**/bundles.info" />
                                 </replace>
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml"
-                                        token="&lt;Context&gt;"
-                                        value="&lt;Context crossContext=&quot;true&quot;&gt;"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/context.xml" token="&lt;Context&gt;" value="&lt;Context crossContext=&quot;true&quot;&gt;" />
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/modules/samples/identity-mgt/info-recovery-sample/pom.xml b/modules/samples/identity-mgt/info-recovery-sample/pom.xml
index 5a29d49b7c6..b76bb101d34 100644
--- a/modules/samples/identity-mgt/info-recovery-sample/pom.xml
+++ b/modules/samples/identity-mgt/info-recovery-sample/pom.xml
@@ -17,14 +17,12 @@
   ~ under the License.
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-info-recovery</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/identity-mgt/pom.xml b/modules/samples/identity-mgt/pom.xml
index 3a817d75ae4..3e8d1296467 100644
--- a/modules/samples/identity-mgt/pom.xml
+++ b/modules/samples/identity-mgt/pom.xml
@@ -16,14 +16,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml b/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
index 02b779b0555..2419c6891ee 100644
--- a/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
+++ b/modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
@@ -10,13 +10,12 @@
 	License for the specific language governing permissions and ~ limitations 
 	under the License. -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-oauth10a</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
     </parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/oauth/pom.xml b/modules/samples/oauth/pom.xml
index d053e7b6e57..74a7c6984da 100644
--- a/modules/samples/oauth/pom.xml
+++ b/modules/samples/oauth/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/custom-grant/pom.xml b/modules/samples/oauth2/custom-grant/pom.xml
index bb53313ed9b..27a6bd6537f 100644
--- a/modules/samples/oauth2/custom-grant/pom.xml
+++ b/modules/samples/oauth2/custom-grant/pom.xml
@@ -16,14 +16,12 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-oauth2</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/playground2/pom.xml b/modules/samples/oauth2/playground2/pom.xml
index 96205658c05..46436316e9f 100755
--- a/modules/samples/oauth2/playground2/pom.xml
+++ b/modules/samples/oauth2/playground2/pom.xml
@@ -1,11 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-oauth2</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/oauth2/pom.xml b/modules/samples/oauth2/pom.xml
index 2ac8545a2a8..8105cc4ce9a 100644
--- a/modules/samples/oauth2/pom.xml
+++ b/modules/samples/oauth2/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml b/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml
index 8ed0a106ff6..fcf07e017f4 100644
--- a/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml
+++ b/modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>PassiveSTSSample</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml b/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml
index 65addc29467..3083765c0a2 100644
--- a/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml
+++ b/modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>PassiveSTSSample</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/passive-sts-client/pom.xml b/modules/samples/passive-sts/passive-sts-client/pom.xml
index a36b5e10241..d72580e58a7 100644
--- a/modules/samples/passive-sts/passive-sts-client/pom.xml
+++ b/modules/samples/passive-sts/passive-sts-client/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-passivests</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/passive-sts/pom.xml b/modules/samples/passive-sts/pom.xml
index 92d9108a294..4ab17e88bc6 100644
--- a/modules/samples/passive-sts/pom.xml
+++ b/modules/samples/passive-sts/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index b716e053bf4..531dea1c80b 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0-beta</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/scim/pom.xml b/modules/samples/scim/pom.xml
index 99c52d0cb73..07b08b82ed7 100644
--- a/modules/samples/scim/pom.xml
+++ b/modules/samples/scim/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/scim/scim-provisioning/pom.xml b/modules/samples/scim/scim-provisioning/pom.xml
index 6918c110087..5ebe6235646 100644
--- a/modules/samples/scim/scim-provisioning/pom.xml
+++ b/modules/samples/scim/scim-provisioning/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-scim</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/sso/pom.xml b/modules/samples/sso/pom.xml
index c5e4feba960..4ea56cb2d5f 100644
--- a/modules/samples/sso/pom.xml
+++ b/modules/samples/sso/pom.xml
@@ -15,15 +15,13 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/samples/sso/sso-agent-sample/pom.xml b/modules/samples/sso/sso-agent-sample/pom.xml
index 10dbf77607c..e3ab70f6673 100644
--- a/modules/samples/sso/sso-agent-sample/pom.xml
+++ b/modules/samples/sso/sso-agent-sample/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-sso</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sts/pom.xml b/modules/samples/sts/pom.xml
index ef503b9caff..a8b40fd7831 100644
--- a/modules/samples/sts/pom.xml
+++ b/modules/samples/sts/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/sts/sts-client/pom.xml b/modules/samples/sts/sts-client/pom.xml
index 15ab6eb8f3f..4f1c629a35b 100644
--- a/modules/samples/sts/sts-client/pom.xml
+++ b/modules/samples/sts/sts-client/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-sts</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/user-mgt/pom.xml b/modules/samples/user-mgt/pom.xml
index df3dbb34d40..de41832cbc2 100644
--- a/modules/samples/user-mgt/pom.xml
+++ b/modules/samples/user-mgt/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/user-mgt/remote-user-mgt/pom.xml b/modules/samples/user-mgt/remote-user-mgt/pom.xml
index 5bb0dfb4fa7..ad2b37096a5 100644
--- a/modules/samples/user-mgt/remote-user-mgt/pom.xml
+++ b/modules/samples/user-mgt/remote-user-mgt/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.wso2.is</groupId>
         <artifactId>wso2is-identity-samples-usermgt</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/xacml/pom.xml b/modules/samples/xacml/pom.xml
index bcf1c7750ee..fe735d8faaf 100644
--- a/modules/samples/xacml/pom.xml
+++ b/modules/samples/xacml/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>wso2is-identity-samples</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml
index ff552c770bf..f97fbe9c559 100644
--- a/modules/styles/pom.xml
+++ b/modules/styles/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
     	<groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-parent</artifactId>
-    	<version>5.1.0-SNAPSHOT</version>
+    	<version>5.1.0-beta</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml
index 7a6f5566a6c..a06f936bec3 100644
--- a/modules/styles/product/pom.xml
+++ b/modules/styles/product/pom.xml
@@ -15,14 +15,12 @@
  ~ specific language governing permissions and limitations
  ~ under the License.
  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.is</groupId>
     	<artifactId>identity-server-styles-parent</artifactId>
-        <version>5.1.0-SNAPSHOT</version>
+        <version>5.1.0-beta</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index f76e3805172..c85aca61d09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2</groupId>
@@ -29,7 +28,7 @@
     <artifactId>identity-server-parent</artifactId>
     <packaging>pom</packaging>
     <description>WSO2 Identity Server</description>
-    <version>5.1.0-SNAPSHOT</version>
+    <version>5.1.0-beta</version>
     <name>WSO2 Identity Server</name>
     <url>http://wso2.org/projects/identity</url>
 
@@ -1175,7 +1174,7 @@
         <url>https://github.com/wso2/product-is.git</url>
         <developerConnection>scm:git:https://github.com/wso2/product-is.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/product-is.git</connection>
-        <tag>HEAD</tag>
+        <tag>v5.1.0-beta</tag>
     </scm>