diff --git a/modules/distribution/carbon-home/conf/security/client-truststore.jks b/modules/distribution/carbon-home/conf/security/client-truststore.jks
new file mode 100644
index 00000000..9e3a51db
Binary files /dev/null and b/modules/distribution/carbon-home/conf/security/client-truststore.jks differ
diff --git a/modules/distribution/carbon-home/conf/security/wso2carbon.jks b/modules/distribution/carbon-home/conf/security/wso2carbon.jks
new file mode 100644
index 00000000..7942c53c
Binary files /dev/null and b/modules/distribution/carbon-home/conf/security/wso2carbon.jks differ
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index c39e931f..4ae35146 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -61,6 +61,11 @@
             <outputDirectory>conf/osgi</outputDirectory>
             <fileMode>644</fileMode>
         </fileSet>
+        <fileSet>
+            <directory>carbon-home/conf/security</directory>
+            <outputDirectory>conf/security</outputDirectory>
+            <fileMode>644</fileMode>
+        </fileSet>
         <fileSet>
             <directory>carbon-home/resources/security</directory>
             <outputDirectory>resources/security</outputDirectory>
diff --git a/pom.xml b/pom.xml
index 011ad93b..2d18c507 100644
--- a/pom.xml
+++ b/pom.xml
@@ -641,7 +641,7 @@
     </build>
 
     <properties>
-        <carbon.analytics.version>2.0.15</carbon.analytics.version>
+        <carbon.analytics.version>2.0.24</carbon.analytics.version>
         <siddhi.version>4.0.0-M5</siddhi.version>
         <siddhi.extension.version>1.0.0</siddhi.extension.version>