diff --git a/modules/distribution/src/broker/conf/broker.xml b/modules/distribution/src/broker/conf/broker.xml
index b7be838a..229c75dd 100755
--- a/modules/distribution/src/broker/conf/broker.xml
+++ b/modules/distribution/src/broker/conf/broker.xml
@@ -171,17 +171,7 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
 					inherit from org.dna.mqtt.moquette.server.IAutherizer
 					Note: default implementation authorizes against carbon permission with the topic.
 				-->
-				<!--connectionPermission is required for a user to connect to broker
-				subscriberPermission is needed to subscribe(subriber permission can be more than one)
-				publisherPermission is needed to publish(publisher permission can be more than one)
-				-->
 				<authorizer class="org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.DeviceAccessBasedMQTTAuthorizer">
-					<!--<property name="connectionPermission">/permission/admin/device-mgt/user</property>-->
-					<!--topic subscription permissions which are assigned through grouping-->
-					<property name="subscriberPermission">/permission/device-mgt/user/groups/device_events</property>
-					<!--topic publisher permissions which are assigned through grouping-->
-					<property name="publisherPermission">/permission/device-mgt/user/groups/device_operation</property>
-
 					<property name="username">admin</property>
 					<property name="password">admin</property>
 					<property name="tokenEndpoint">https://localhost:8243</property>
diff --git a/modules/distribution/src/core/conf/security/authenticators.xml b/modules/distribution/src/core/conf/security/authenticators.xml
index 4b8e8fb8..0f9130b9 100644
--- a/modules/distribution/src/core/conf/security/authenticators.xml
+++ b/modules/distribution/src/core/conf/security/authenticators.xml
@@ -28,15 +28,6 @@
 	<Authenticator name="SignedJWTAuthenticator" disabled="false">
 		<Priority>5</Priority>
 	</Authenticator>
-	<Authenticator name="OAuthAuthenticator" disabled="true">
-		<Priority>10</Priority>
-		<Config>
-			<Parameter name="isRemote">false</Parameter>
-			<Parameter name="hostURL">https://localhost:9443</Parameter>
-			<Parameter name="adminUsername">admin</Parameter>
-			<Parameter name="adminPassword">admin</Parameter>
-		</Config>
-	</Authenticator>
 
     <!-- authenticator Configurations for TokenUIAuthenticator -->
     <Authenticator name="TokenUIAuthenticator" disabled="false">
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks
index ab222fdd..c477431c 100644
Binary files a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks and b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks differ
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks
index 79784a5e..11686670 100644
Binary files a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks and b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks differ
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks
index ab222fdd..c477431c 100644
Binary files a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks and b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks differ
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks
index 79784a5e..11686670 100644
Binary files a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks and b/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks differ
diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml
index 1ae824a1..3dd699fd 100644
--- a/modules/p2-profile/broker-profile/pom.xml
+++ b/modules/p2-profile/broker-profile/pom.xml
@@ -334,8 +334,7 @@
                                     <version>${analytics.shared.version}</version>
                                 </feature>
                                 <feature>
-                                    <id>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature.group
-                                    </id>
+                                    <id>org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>