diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index a3e97f63860..4e90f79d101 100755
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -221,7 +221,7 @@
 
                                 <property name="4-space-tab" value=" " />
                                 <property name="identity-db" value="${4-space-tab}&lt;datasource&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;name&gt;WSO2_IDENTITY_DB&lt;/name&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;description&gt;The datasource used for identity data&lt;/description&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;jndiConfig&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;name&gt;jdbc/WSO2IdentityDB&lt;/name&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;/jndiConfig&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;definition type=&quot;RDBMS&quot;&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;configuration&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;url&gt;jdbc:h2:./repository/database/WSO2IDENTITY_DB;DB_CLOSE_ON_EXIT=FALSE&lt;/url&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;username&gt;wso2carbon&lt;/username&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;password&gt;wso2carbon&lt;/password&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;driverClassName&gt;org.h2.Driver&lt;/driverClassName&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;maxActive&gt;50&lt;/maxActive&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;maxWait&gt;60000&lt;/maxWait&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;testOnBorrow&gt;true&lt;/testOnBorrow&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;validationQuery&gt;SELECT 1&lt;/validationQuery&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;validationInterval&gt;30000&lt;/validationInterval&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;defaultAutoCommit&gt;true&lt;/defaultAutoCommit&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;/configuration&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;/definition&gt;${line.separator}${4-space-tab}${4-space-tab}&lt;/datasource&gt;${line.separator}${4-space-tab}&lt;/datasources&gt;" />
-                                <property name="identity-db-template" value="${4-space-tab}&lt;datasource&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;name&gt;WSO2_IDENTITY_DB&lt;/name&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;description&gt;Shared database for identity data&lt;/description&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;jndiConfig&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;name&gt;jdbc/WSO2IdentityDB&lt;/name&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;/jndiConfig&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;definition type=&quot;RDBMS&quot;&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;configuration&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;url&gt;{{database.identity_db.url}}&lt;/url&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;username&gt;{{database.identity_db.username}}&lt;/username&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;password&gt;{{database.identity_db.password}}&lt;/password&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;driverClassName&gt;{{database.identity_db.driver}}&lt;/driverClassName&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}{% for property_name,property_value in database.identity_db.pool_options.items() %}${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;{{property_name}}&gt;{{property_value}}&lt;/{{property_name}}&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}{% endfor %}${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;/configuration&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;/definition&gt;${line.separator}${4-space-tab}${4-space-tab}&lt;/datasource&gt;${line.separator}${4-space-tab}&lt;/datasources&gt;" />
+                                <property name="identity-db-template" value="${4-space-tab}&lt;datasource&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;name&gt;WSO2_IDENTITY_DB&lt;/name&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;description&gt;Shared database for identity data&lt;/description&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;jndiConfig&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;name&gt;jdbc/WSO2IdentityDB&lt;/name&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;/jndiConfig&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;definition type=&quot;RDBMS&quot;&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;configuration&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;url&gt;{{database.identity_db.url}}&lt;/url&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;username&gt;{{database.identity_db.username}}&lt;/username&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;password&gt;{{database.identity_db.password}}&lt;/password&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;driverClassName&gt;{{database.identity_db.driver}}&lt;/driverClassName&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}{% if database.identity_db.db_props %}${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;databaseProps&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}{% for property_name,property_value in database.identity_db.db_props.items() %}${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;property name=&quot;{{property_name}}&quot;&gt;{{property_value}}&lt;/property&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}{% endfor %}${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;/databaseProps&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}{% endif %}${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}{% for property_name, property_value in database.identity_db.pool_options.items() %}${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;{{property_name}}&gt;{{property_value}}&lt;/{{property_name}}&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}{% endfor %}${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}${4-space-tab}&lt;/configuration&gt;${line.separator}${4-space-tab}${4-space-tab}${4-space-tab}&lt;/definition&gt;${line.separator}${4-space-tab}${4-space-tab}&lt;/datasource&gt;${line.separator}${4-space-tab}&lt;/datasources&gt;" />
 
                                 <property name="captcha-filter-is-token" value="{% if recaptcha.enabled is sameas true %}${line.separator}&lt;filter&gt;${line.separator} &lt;filter-name&gt;CaptchaFilter&lt;/filter-name&gt;${line.separator} &lt;filter-class&gt;org.wso2.carbon.identity.captcha.filter.CaptchaFilter&lt;/filter-class&gt;${line.separator} &lt;/filter&gt;${line.separator}${line.separator} &lt;filter-mapping&gt;${line.separator} &lt;filter-name&gt;CaptchaFilter&lt;/filter-name&gt;${line.separator} &lt;url-pattern&gt;/samlsso&lt;/url-pattern&gt;${line.separator} &lt;url-pattern&gt;/oauth2&lt;/url-pattern&gt;${line.separator} &lt;url-pattern&gt;/commonauth&lt;/url-pattern&gt;${line.separator} &lt;url-pattern&gt;/identity/recovery/v0.9/recover-password&lt;/url-pattern&gt;${line.separator} &lt;url-pattern&gt;/identity/recovery/v0.9/recover-username/&lt;/url-pattern&gt;${line.separator} &lt;url-pattern&gt;/identity/recovery/v0.9/security-question&lt;/url-pattern&gt;${line.separator} &lt;url-pattern&gt;/identity/recovery/v0.9/validate-answer&lt;/url-pattern&gt;${line.separator} &lt;url-pattern&gt;/identity/user/v1.0/me&lt;/url-pattern&gt;${line.separator} &lt;url-pattern&gt;/identity/user/v1.0/resend-code&lt;/url-pattern&gt;${line.separator} &lt;dispatcher&gt;FORWARD&lt;/dispatcher&gt;${line.separator} &lt;dispatcher&gt;REQUEST&lt;/dispatcher&gt;${line.separator} &lt;/filter-mapping&gt;${line.separator}${line.separator}{% endif %}${line.separator}&lt;/web-app&gt;" />