diff --git a/modules/distribution/carbon-home/resources/security/client-truststore.jks b/modules/distribution/carbon-home/resources/security/client-truststore.jks
new file mode 100644
index 00000000..9e3a51db
Binary files /dev/null and b/modules/distribution/carbon-home/resources/security/client-truststore.jks differ
diff --git a/modules/samples/sample-clients/http-client/pom.xml b/modules/samples/sample-clients/http-client/pom.xml
index 83568ef9..97b51840 100644
--- a/modules/samples/sample-clients/http-client/pom.xml
+++ b/modules/samples/sample-clients/http-client/pom.xml
@@ -27,22 +27,11 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <name>WSO2 Data Analytics Server - Sample - TCP Client</name>
-    <artifactId>tcp-client</artifactId>
+    <name>WSO2 Data Analytics Server - Sample - HTTP Client</name>
+    <artifactId>http-client</artifactId>
     <packaging>pom</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.10</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.extension.siddhi.io.http</groupId>
-            <artifactId>siddhi-io-http</artifactId>
-            <version>1.0.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.siddhi</groupId>
             <artifactId>siddhi-core</artifactId>
diff --git a/modules/samples/sample-clients/http-server/pom.xml b/modules/samples/sample-clients/http-server/pom.xml
index 75061278..60e4794d 100644
--- a/modules/samples/sample-clients/http-server/pom.xml
+++ b/modules/samples/sample-clients/http-server/pom.xml
@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <name>WSO2 Data Analytics Server - Sample - TCP Server</name>
+    <name>WSO2 Data Analytics Server - Sample - HTTP Server</name>
     <build>
         <plugins>
             <plugin>
@@ -40,36 +40,15 @@
             </plugin>
         </plugins>
     </build>
-    <artifactId>tcp-server</artifactId>
+    <artifactId>http-server</artifactId>
     <packaging>pom</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>com.sun.net.httpserver</groupId>
-            <artifactId>http</artifactId>
-            <version>20070405</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.extension.siddhi.io.http</groupId>
-            <artifactId>siddhi-io-http</artifactId>
-            <version>1.0.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.siddhi</groupId>
             <artifactId>siddhi-core</artifactId>
             <version>${siddhi.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.siddhi</groupId>
-            <artifactId>siddhi-query-api</artifactId>
-            <version>${siddhi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.siddhi</groupId>
-            <artifactId>siddhi-annotations</artifactId>
-            <version>${siddhi.version}</version>
-        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/modules/samples/sample-clients/pom.xml b/modules/samples/sample-clients/pom.xml
index 0fc127b2..2a443b5f 100644
--- a/modules/samples/sample-clients/pom.xml
+++ b/modules/samples/sample-clients/pom.xml
@@ -36,5 +36,7 @@
         <module>kafka-producer</module>
         <module>tcp-client</module>
         <module>tcp-server</module>
+        <module>http-server</module>
+        <module>http-client</module>
     </modules>
 </project>
\ No newline at end of file