diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index ae1c8f74..6d9ddcce 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -667,6 +667,10 @@
 								<property name="tempdir" value="target/webapp-temp" />
 								<property name="xmldir" value="src/core/resources/web-apps/web-xml" />
 								<property name="srcdir" value="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/webapps" />
+								<property name="wso2iothome" value="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}" />
+								<property name="wso2analyticshome" value="${basedir}/../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}"/>
+								<property name="wso2brokerhome" value="${basedir}/../p2-profile/broker-profile/target/wso2carbon-core-${carbon.kernel.version}"/>
+
 
 								<mkdir dir="${tempdir}" />
 								<mkdir dir="${tempdir}/api-application-registration" />
@@ -780,6 +784,12 @@
 								<zip destfile="${tempdir}/secured-websocket.war" basedir="${tempdir}/secured-websocket" />
 								<zip destfile="${tempdir}/shindig.war" basedir="${tempdir}/shindig" />
 
+								<mkdir dir="${tempdir}/registry"/>
+								<unzip src="${wso2iothome}/wso2/components/plugins/org.wso2.carbon.registry.indexing_${carbon.registry.version}.jar" dest="${tempdir}/registry" />
+								<replace file="${tempdir}/registry/core.properties" token="dataDir=../../../../solr/data" value="dataDir=../../../solr/data" />
+								<zip destfile="${wso2analyticshome}/wso2/components/plugins/org.wso2.carbon.registry.indexing_${carbon.registry.version}.jar" basedir="${tempdir}/registry" />
+								<zip destfile="${wso2iothome}/wso2/components/plugins/org.wso2.carbon.registry.indexing_${carbon.registry.version}.jar" basedir="${tempdir}/registry" />
+								<zip destfile="${wso2brokerhome}/wso2/components/plugins/org.wso2.carbon.registry.indexing_${carbon.registry.version}.jar" basedir="${tempdir}/registry" />
 							</tasks>
 						</configuration>
 					</execution>