diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 9f197af0..c7828d37 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -322,6 +322,37 @@
                             </tasks>
                         </configuration>
                     </execution>
+                    <execution>
+                        <!-- Creating Social DB schema -->
+                        <id>create-social-db-schema</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo message="########### Create Social Plugin H2 Schema ###########"/>
+
+                                <property name="db.dir"
+                                          value="target/wso2carbon-core-${carbon.kernel.version}/repository/database"/>
+                                <property name="userid" value="wso2carbon"/>
+                                <property name="password" value="wso2carbon"/>
+                                <property name="dbURL"
+                                          value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE"/>
+
+                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}"
+                                     autocommit="true" onerror="continue">
+                                    <classpath refid="maven.dependency.classpath"/>
+                                    <classpath refid="maven.compile.classpath"/>
+                                    <classpath refid="maven.runtime.classpath"/>
+
+                                    <fileset
+                                            file="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql"/>
+                                </sql>
+                                <echo message="##################### END ####################"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>3-extract-docs-from-components</id>
                         <phase>package</phase>
diff --git a/modules/distribution/src/repository/conf/datasources/master-datasources.xml b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
index 838a6959..1627f55f 100755
--- a/modules/distribution/src/repository/conf/datasources/master-datasources.xml
+++ b/modules/distribution/src/repository/conf/datasources/master-datasources.xml
@@ -64,6 +64,27 @@
             </definition>
         </datasource>
 
+        <datasource>
+            <name>WSO2_SOCIAL_DB</name>
+            <description>The datasource used for Store social database</description>
+            <jndiConfig>
+                <name>jdbc/WSO2_SOCIAL_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE</url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
+
         <!--<datasource>-->
         <!--<name>WSO2_IDENTITY_DB</name>-->
         <!--<description>The datasource used for Identity configurations</description>-->
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 8b2bfe74..9a3bcb9d 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -474,9 +474,9 @@
                                     org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}
                                 </featureArtifactDef>
 
-                                <!--<featureArtifactDef>-->
-                                    <!--org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}-->
-                                <!--</featureArtifactDef>-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}
+                                </featureArtifactDef>
 
 
                                 <featureArtifactDef>
@@ -1261,11 +1261,11 @@
 
                                 <!-- End of app management features-->
 
-                                <!--<feature>-->
-                                    <!--<id>org.wso2.carbon.social.feature.group</id>-->
-                                    <!--<version>${carbon.store.version}</version>-->
-                                <!--</feature>-->
-                                <!-- Cipher tool feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.social.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                 Cipher tool feature
 
                                 <feature>
                                     <id>org.wso2.ciphertool.feature.group</id>