diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml
index 0d5cc5f2..9b3d5a53 100644
--- a/modules/analytics/distribution/src/assembly/bin.xml
+++ b/modules/analytics/distribution/src/assembly/bin.xml
@@ -184,7 +184,7 @@
inputwebsocket.war
outputwebsocket.war
outputui.war
- secured-outputui.war
+ secured-websocket.war
diff --git a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
index 40548373..56870d68 100644
--- a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
+++ b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
@@ -17,13 +17,13 @@
#
#issuer of the JWT
-iss=CDMF_DEFAULT_IDP
+iss=iot_default
TokenEndpoint=https://localhost:${iot.core.https.port}/oauth2/token
#audience of JWT claim
#comma seperated values
-aud=JwtIdentityAudience
+aud=wso2.org/products/iot
#expiration time of JWT (number of minutes from the current time)
exp=1000
diff --git a/modules/broker/distribution/src/main/conf/broker.xml b/modules/broker/distribution/src/main/conf/broker.xml
index 0551a2a6..ade1fa3e 100755
--- a/modules/broker/distribution/src/main/conf/broker.xml
+++ b/modules/broker/distribution/src/main/conf/broker.xml
@@ -117,7 +117,8 @@ This file is ciphertool compliant. Refer PRODUCT_HOME/repository/conf/security/c
32768
@@ -171,13 +172,23 @@ 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.
-->
-
+
- /permission/admin/device-mgt/user
- /permission/admin/device-mgt/admin
- mqtt-subscriber
- mqtt-subscriber
- device-mgt
+
+
+ /permission/device-mgt/user/groups/device_events
+
+ /permission/device-mgt/user/groups/device_operation
+
+ admin
+ admin
+ https://localhost:9443/oauth2
+
+ 100
+ https://localhost:9443
diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index b30ac330..321c76a5 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -839,7 +839,7 @@
${pom.artifactId}-${pom.version}/repository/conf/identity/identity-providers
true
@@ -1153,7 +1153,7 @@
${pom.artifactId}-${pom.version}/repository/conf/identity/identity-providers
true
@@ -1176,15 +1176,6 @@
true
644
-
-
-
- ${pom.artifactId}-${pom.version}/repository/conf/etc
- true
- 644
-