diff --git a/modules/distribution/src/analytics/conf/tomcat/carbon/WEB-INF/web.xml b/modules/distribution/src/analytics/conf/tomcat/carbon/WEB-INF/web.xml
index ea3db45a..bbbd9954 100644
--- a/modules/distribution/src/analytics/conf/tomcat/carbon/WEB-INF/web.xml
+++ b/modules/distribution/src/analytics/conf/tomcat/carbon/WEB-INF/web.xml
@@ -19,16 +19,6 @@
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
         "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app id="WebApp">
-
-    <security-constraint>
-        <display-name>Restrict access to carbon console</display-name>
-        <web-resource-collection>
-            <web-resource-name>Restricted Console UI</web-resource-name>
-            <url-pattern>/carbon/*</url-pattern>
-        </web-resource-collection>
-        <auth-constraint/>
-    </security-constraint>
-
     <!-- OWASP CSRFGuard per-application configuration property file location-->
     <context-param>
         <param-name>Owasp.CsrfGuard.Config</param-name>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index a92e18f4..26411c46 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -676,6 +676,10 @@
                 <exclude>**/webapp-classloading-environments.xml</exclude>
                 <exclude>**/tomcat/carbon/WEB-INF/web.xml</exclude>
                 <exclude>**/spark-udf-config.xml</exclude>
+                <exclude>**/security/cipher-text.properties</exclude>
+                <exclude>**/security/authenticators.xml</exclude>
+                <exclude>**/security/cipher-tool.properties</exclude>
+                <exclude>**/security/Owasp.CsrfGuard.Carbon.properties</exclude>
             </excludes>
         </fileSet>
 
diff --git a/modules/distribution/src/core/conf/log4j.properties b/modules/distribution/src/core/conf/log4j.properties
index a8a589ac..f1fc1e73 100644
--- a/modules/distribution/src/core/conf/log4j.properties
+++ b/modules/distribution/src/core/conf/log4j.properties
@@ -82,7 +82,7 @@ log4j.logger.org.apache.spark.util.ClosureCleaner=ERROR
 # The console appender is used to display general information at console
 log4j.appender.CARBON_CONSOLE=org.wso2.carbon.utils.logging.appenders.CarbonConsoleAppender
 log4j.appender.CARBON_CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d{ISO8601}] [${logger.server.name}] %5p - %c{1} %m%n
+log4j.appender.CARBON_CONSOLE.layout.ConversionPattern=[%d{ISO8601}] [${logger.server.name}] %5p - {%c} %m%n
 
 # LOGEVENT is set to be a LogEventAppender using a PatternLayout to send logs to LOGEVENT
 log4j.appender.LOGEVENT=org.wso2.carbon.logging.service.appender.LogEventAppender
diff --git a/pom.xml b/pom.xml
index 3d01a982..e6989b48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1576,8 +1576,8 @@
 
         <!-- IoT Broker Dependencies -->
         <product.iot.broker.version>${product.iot.version}</product.iot.broker.version>
-        <andes.version>3.1.3</andes.version>
-        <carbon.messaging.version>3.1.16</carbon.messaging.version>
+        <andes.version>3.1.12</andes.version>
+        <carbon.messaging.version>3.1.17-SNAPSHOT</carbon.messaging.version>
 
         <!-- Third Party Dependencies-->
         <spongycastle.version>1.51.0.0</spongycastle.version>