diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 3ebe56cd..4d0a1183 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -675,6 +675,7 @@
                 <exclude>**/LICENSE.txt</exclude>
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/webapp-mode/WEB-INF/web.xml</exclude>
+                <exclude>**/tomcat/catalina-server.xml</exclude>
             </excludes>
         </fileSet>
 
@@ -971,6 +972,7 @@
                 <exclude>**/LICENSE.txt</exclude>
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/dbscripts</exclude>
+                <exclude>**/tomcat/catalina-server.xml</exclude>
             </excludes>
         </fileSet>
 
@@ -1227,6 +1229,18 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/core/conf/tomcat/catalina-server.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/conf/tomcat</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/core/conf/tomcat/catalina-server.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/conf/tomcat</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!-- Copying synapse-handlers.xml file -->
         <file>
             <source>src/core/conf/synapse-handlers.xml</source>
diff --git a/modules/distribution/src/core/conf/tomcat/catalina-server.xml b/modules/distribution/src/core/conf/tomcat/catalina-server.xml
index fdc212f2..65e534c3 100644
--- a/modules/distribution/src/core/conf/tomcat/catalina-server.xml
+++ b/modules/distribution/src/core/conf/tomcat/catalina-server.xml
@@ -38,7 +38,7 @@
                    maxKeepAliveRequests="200"
                    acceptCount="200"
                    server="WSO2 Carbon Server"
-                   compression="on"
+                   compression="off"
                    compressionMinSize="2048"
                    noCompressionUserAgents="gozilla, traviata"
                    compressableMimeType="text/html,text/javascript,application/x-javascript,application/javascript,application/xml,text/css,application/xslt+xml,text/xsl,image/gif,image/jpg,image/jpeg"
@@ -65,7 +65,7 @@
                    acceptCount="200"
                    server="WSO2 Carbon Server"
                    clientAuth="want"
-                   compression="on"
+                   compression="off"
                    scheme="https"
                    secure="true"
                    SSLEnabled="true"