diff --git a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
index 2d3df3e061..e88716313f 100644
--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
@@ -63,13 +63,13 @@
                             javax.xml.bind.annotation,
                             javax.xml.parsers;version="${javax.xml.parsers.import.pkg.version}";resolution:=optional,
                             javax.xml.validation,
-                            org.apache.catalina,
-                            org.apache.catalina.connector,
-                            org.apache.catalina.util,
+                            <!--org.apache.catalina,-->
+                            <!--org.apache.catalina.connector,-->
+                            <!--org.apache.catalina.util,-->
                             org.apache.commons.logging,
-                            org.apache.coyote,
-                            org.apache.tomcat.util.buf,
-                            org.apache.tomcat.util.http,
+                            <!--org.apache.coyote,-->
+                            <!--org.apache.tomcat.util.buf,-->
+                            <!--org.apache.tomcat.util.http,-->
                             org.osgi.service.component,
                             org.osgi.framework,
                             org.w3c.dom,
@@ -106,7 +106,7 @@
                             org.apache.commons.pool.impl,
                             org.apache.http.conn,
                             org.apache.http.impl.conn,
-                            javax.xml.soap; version="${javax.xml.soap.imp.pkg.version}",
+                            <!--javax.xml.soap; version="${javax.xml.soap.imp.pkg.version}",-->
                             javax.xml.stream,
                             org.apache.axiom.*; version="${axiom.osgi.version.range}",
                             org.wso2.carbon.registry.core.*,
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2
index 8774964271..2550288629 100644
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2
@@ -195,11 +195,11 @@
         <Category>Video Players &amp; Editors</Category>
         <Category>Weather</Category>
         <Category>GooglePlaySyncedApp</Category>
-        {% if application_mgt_conf.app_categories is defined %}
-            {%- for app_category in application_mgt_conf.app_categories -%}
-            <Category>{{app_category}}</Category>
-            {% endfor %}
-        {% endif %}
+    {% if application_mgt_conf.app_categories is defined %}
+        {%- for app_category in application_mgt_conf.app_categories -%}
+        <Category>{{app_category}}</Category>
+        {% endfor %}
+    {% endif %}
     </AppCategories>
 
     <RatingConfig>
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/webapp-authenticator-config.xml.j2 b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/webapp-authenticator-config.xml.j2
new file mode 100644
index 0000000000..187c9131fe
--- /dev/null
+++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/webapp-authenticator-config.xml.j2
@@ -0,0 +1,118 @@
+<WebappAuthenticatorConfig>
+	<Authenticators>
+		<Authenticator>
+			<Name>OAuth</Name>
+			{% if webapp_auth_conf.authenticator.oauth is defined %}
+			<ClassName>{{webapp_auth_conf.authenticator.oauth.class_name}}</ClassName>
+            <Parameters>
+                {% for property_name,property_value in webapp_auth_conf.authenticator.oauth.parameter_options.items() %}
+                <Parameter Name="{{property_name}}">{{property_value}}</Parameter>
+                {% endfor %}
+            </Parameters>
+			{% else %}
+			<ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.OAuthAuthenticator</ClassName>
+            <Parameters>
+                <Parameter Name="IsRemote">false</Parameter>
+                <Parameter Name="TokenValidationEndpointUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</Parameter>
+                <Parameter Name="Username">admin</Parameter>
+                <Parameter Name="Password">admin</Parameter>
+                <Parameter Name="MaxTotalConnections">100</Parameter>
+                <Parameter Name="MaxConnectionsPerHost">100</Parameter>
+            </Parameters>
+            {% endif %}
+		</Authenticator>
+        <Authenticator>
+            <Name>BasicAuth</Name>
+            {% if webapp_auth_conf.authenticator.basic_auth is defined %}
+            <ClassName>{{webapp_auth_conf.authenticator.basic_auth.class_name}}</ClassName>
+            <Parameters>
+                {% for property_name,property_value in webapp_auth_conf.authenticator.basic_auth.parameter_options.items() %}
+                <Parameter Name="{{property_name}}">{{property_value}}</Parameter>
+                {% endfor %}
+            </Parameters>
+            {% else %}
+            <ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.BasicAuthAuthenticator</ClassName>
+            {% endif %}
+        </Authenticator>
+        <Authenticator>
+            <Name>JWT</Name>
+            {% if webapp_auth_conf.authenticator.jwt is defined %}
+            <ClassName>{{webapp_auth_conf.authenticator.jwt.class_name}}</ClassName>
+            <Parameters>
+                {% for property_name,property_value in webapp_auth_conf.authenticator.jwt.parameter_options.items() %}
+                <Parameter Name="{{property_name}}">{{property_value}}</Parameter>
+                {% endfor %}
+            </Parameters>
+            {% else %}
+            <ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.JWTAuthenticator</ClassName>
+            <Parameters>
+				<!--Issuers list and corresponding cert alias-->
+				<Parameter Name="default">wso2carbon</Parameter>
+                <Parameter Name="wso2.org/products/am">wso2carbon</Parameter>
+				<Parameter Name="wso2.org/products/iot">wso2carbon</Parameter>
+				<Parameter Name="wso2.org/products/analytics">wso2carbon</Parameter>
+            </Parameters>
+            {% endif %}
+        </Authenticator>
+        <Authenticator>
+            <Name>CertificateAuth</Name>
+            {% if webapp_auth_conf.authenticator.certificate_auth is defined %}
+            <ClassName>{{webapp_auth_conf.authenticator.certificate_auth.class_name}}</ClassName>
+            <Parameters>
+                {% for property_name,property_value in webapp_auth_conf.authenticator.certificate_auth.parameter_options.items() %}
+                <Parameter Name="{{property_name}}">{{property_value}}</Parameter>
+                {% endfor %}
+            </Parameters>
+            {% else %}
+            <ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.CertificateAuthenticator</ClassName>
+            {% endif %}
+        </Authenticator>
+        <Authenticator>
+            <Name>OTPAuth</Name>
+            {% if webapp_auth_conf.authenticator.otpauth is defined %}
+            <ClassName>{{webapp_auth_conf.authenticator.otpauth.class_name}}</ClassName>
+            <Parameters>
+                {% for property_name,property_value in webapp_auth_conf.authenticator.otpauth.parameter_options.items() %}
+                <Parameter Name="{{property_name}}">{{property_value}}</Parameter>
+                {% endfor %}
+            </Parameters>
+            {% else %}
+            <ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.OneTimeTokenAuthenticator</ClassName>
+            {% endif %}
+        </Authenticator>
+        <Authenticator>
+            <Name>BST</Name>
+            {% if webapp_auth_conf.authenticator.bst is defined %}
+            <ClassName>{{webapp_auth_conf.authenticator.bst.class_name}}</ClassName>
+            <Parameters>
+                {% for property_name,property_value in webapp_auth_conf.authenticator.bst.parameter_options.items() %}
+                <Parameter Name="{{property_name}}">{{property_value}}</Parameter>
+                {% endfor %}
+            </Parameters>
+            {% else %}
+            <ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.BSTAuthenticator</ClassName>
+            <Parameters>
+                <Parameter Name="IsRemote">false</Parameter>
+                <Parameter Name="TokenValidationEndpointUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</Parameter>
+                <Parameter Name="Username">admin</Parameter>
+                <Parameter Name="Password">admin</Parameter>
+                <Parameter Name="MaxTotalConnections">100</Parameter>
+                <Parameter Name="MaxConnectionsPerHost">100</Parameter>
+            </Parameters>
+            {% endif %}
+        </Authenticator>
+    {% if webapp_auth_conf.authenticators is defined %}
+        {%- for authenticator in webapp_auth_conf.authenticators -%}
+        <Authenticator>
+            <Name>{{authenticator.name}}</Name>
+            <ClassName>{{authenticator.class_name}}</ClassName>
+            <Parameters>
+                {% for property_name,property_value in authenticator.parameter_options.items() %}
+                <Parameter Name="{{property_name}}">{{property_value}}</Parameter>
+                {% endfor %}
+            </Parameters>
+         </Authenticator>
+        {% endfor %}
+    {% endif %}
+	</Authenticators>
+</WebappAuthenticatorConfig>
diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf
index 7b1ad15df1..a526d71269 100644
--- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf
+++ b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf
@@ -1,2 +1,3 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.webapp.authenticator.framework.server_${feature.version}/conf/webapp-authenticator-config.xml,target:${installFolder}/../../conf/etc/webapp-authenticator-config.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.webapp.authenticator.framework.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\
diff --git a/pom.xml b/pom.xml
index e3e7998167..afa35d50db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
         <module>components/certificate-mgt</module>
         <module>components/ui-request-interceptor</module>
         <module>components/transport-mgt</module>
+        <module>components/webapp-authenticator-framework</module>
         <module>features/device-mgt</module>
         <module>features/apimgt-extensions</module>
         <module>features/application-mgt</module>
@@ -54,6 +55,7 @@
         <module>features/jwt-client</module>
 	    <module>features/device-mgt-extensions</module>
         <module>features/transport-mgt</module>
+        <module>features/webapp-authenticator-framework</module>
     </modules>
 
     <dependencyManagement>