diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 41361479..6d32d878 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -252,7 +252,9 @@
                 <exclude>**/synapse-configs/**</exclude>
                 <exclude>**/web-apps/**</exclude>
                 <exclude>**/appm-tenant-conf.xml</exclude>
+				<exclude>**/client-truststore.jks</exclude>
             </excludes>
+
         </fileSet>
 
         <fileSet>
@@ -322,6 +324,9 @@
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources
             </outputDirectory>
+			<excludes>
+				<exclude>**/client-truststore.jks</exclude>
+			</excludes>
         </fileSet>
 
         <!-- Copying device type deployer files -->
@@ -689,6 +694,7 @@
                 <exclude>**/LICENSE.txt</exclude>
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/webapp-mode/WEB-INF/web.xml</exclude>
+				<exclude>**/repository/resources/security/client-truststore.jks</exclude>
             </excludes>
         </fileSet>
 
@@ -965,6 +971,7 @@
                 <exclude>**/LICENSE.txt</exclude>
                 <exclude>**/release-notes.html</exclude>
                 <exclude>**/dbscripts</exclude>
+				<exclude>**/repository/resources/security/client-truststore.jks</exclude>
             </excludes>
         </fileSet>
 
@@ -1878,5 +1885,23 @@
             <fileMode>644</fileMode>
         </file>
         <!-- ********************************* End of Broker Profile ********************************* -->
+
+		<!--Start - Need to remove after kernel 4.4.17 release-->
+		<file>
+			<source>src/core/resources/security/client-truststore.jks</source>
+			<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/security</outputDirectory>
+			<fileMode>644</fileMode>
+		</file>
+		<file>
+			<source>src/core/resources/security/client-truststore.jks</source>
+			<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/resources/security</outputDirectory>
+			<fileMode>644</fileMode>
+		</file>
+		<file>
+			<source>src/core/resources/security/client-truststore.jks</source>
+			<outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/repository/resources/security</outputDirectory>
+			<fileMode>644</fileMode>
+		</file>
+		<!--End-->
     </files>
 </assembly>
diff --git a/modules/distribution/src/core/resources/security/client-truststore.jks b/modules/distribution/src/core/resources/security/client-truststore.jks
new file mode 100644
index 00000000..c477431c
Binary files /dev/null and b/modules/distribution/src/core/resources/security/client-truststore.jks differ
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststores.jks b/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststores.jks
new file mode 100644
index 00000000..c477431c
Binary files /dev/null and b/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststores.jks differ
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststores.jks b/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststores.jks
new file mode 100644
index 00000000..c477431c
Binary files /dev/null and b/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststores.jks differ