diff --git a/modules/broker/distribution/src/main/assembly/bin.xml b/modules/broker/distribution/src/main/assembly/bin.xml
index b76a5117..15dda311 100644
--- a/modules/broker/distribution/src/main/assembly/bin.xml
+++ b/modules/broker/distribution/src/main/assembly/bin.xml
@@ -223,6 +223,33 @@
644
+
+
+
+ ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/
+
+ wso2iot-broker-${pom.version}/repository/conf/advanced
+
+ **/qpid-config.xml
+ **/qpid-virtualhosts.xml
+ **/qpid-jmxremote.access
+
+ 644
+
+
+
+
+ ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
+
+ wso2iot-broker-${pom.version}/repository/conf/multitenancy
+
+ **/stratos.xml
+ **/multitenancy-packages.xml
+ **/usage-throttling-agent-config.xml
+ **/cloud-services-desc.xml
+
+ 644
+
lib/home
@@ -409,6 +436,30 @@
true
644
+
+
+ wso2iot-broker-${pom.version}/repository/conf/etc/
+ 644
+
+
+
+ wso2iot-broker-${pom.version}/repository/conf/
+ false
+ 644
+
+
+
+ wso2iot-broker-${pom.version}/repository/conf/
+ false
+ 644
+
+
+
+ ${pom.artifactId}-${pom.version}/repository/conf/datasources/
+ 644
+
${pom.artifactId}-${pom.version}/repository/database/
@@ -442,5 +493,19 @@
${pom.artifactId}-${pom.version}/lib
644
+
+
+
+ ${pom.artifactId}-${pom.version}/repository/conf/identity
+ 644
+
+
+
+ ${pom.artifactId}-${pom.version}/repository/conf/data-bridge
+ true
+ 644
+