diff --git a/pom.xml b/pom.xml
index 9f33f4979..322738f0f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         <plugin.samples.version>4.0.0-SNAPSHOT</plugin.samples.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.scm.id>my-scm-server</project.scm.id>
-        <tycho-version>1.1.0</tycho-version>
+        <tycho-version>1.3.0</tycho-version>
         <version.mvn-resource-plugin>2.7</version.mvn-resource-plugin>
         <version.sortpom.plugin>2.3.0</version.sortpom.plugin>
         <webeditor.version>4.0.0-SNAPSHOT</webeditor.version>
@@ -83,7 +83,7 @@
                 <checksumPolicy>ignore</checksumPolicy>
             </releases>
             <id>Eclipse-p2-repo</id>
-            <url>http://download.eclipse.org/releases/oxygen/</url>
+            <url>http://download.eclipse.org/releases/2020-06/</url>
             <layout>p2</layout>
         </repository>
         <repository>
diff --git a/rcp-product/org.wso2.developerstudio.rcp.product/developerstudio.product b/rcp-product/org.wso2.developerstudio.rcp.product/developerstudio.product
index ff696634b..d51ac7e6f 100644
--- a/rcp-product/org.wso2.developerstudio.rcp.product/developerstudio.product
+++ b/rcp-product/org.wso2.developerstudio.rcp.product/developerstudio.product
@@ -263,11 +263,9 @@ Please visit : http://wso2.com/products/developer-studio/
    </plugins>
 
    <features>
-      <!-- Basic Eclipse Features -->
       <feature id="org.eclipse.e4.rcp"/>
       <feature id="org.eclipse.emf.ecore"/>
       <feature id="org.eclipse.emf.common"/>
-      <feature id="org.wso2.developerstudio.rcp.feature" installMode="root"/>
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.egit"/>
       <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
@@ -328,13 +326,13 @@ Please visit : http://wso2.com/products/developer-studio/
       <feature id="org.eclipse.wst.ws_userdoc.feature"/>
       <feature id="org.eclipse.jst.web_ui.feature"/>
       <feature id="org.eclipse.jst.web_userdoc.feature"/>
-      <feature id="org.wso2.developerstudio.kernel.feature" installMode="root"/>
-      <feature id="org.wso2.developerstudio.kernel.wso2plugins.samples.feature" installMode="root"/>
-      <feature id="org.eclipse.pde" version="3.13.4.v20180330-0640"/>
-      <feature id="org.eclipse.jdt" version="3.13.4.v20180330-0919"/>
+      <feature id="org.eclipse.pde"/>
+      <feature id="org.eclipse.jdt"/>
       <feature id="org.roussev.http4e.feature" version="5.0.12"/>
       <feature id="de.jcup.yamleditor"/>
-      <!-- Dev studio kernel/platform features -->
+      <feature id="org.wso2.developerstudio.rcp.feature" installMode="root"/>
+      <feature id="org.wso2.developerstudio.kernel.feature" installMode="root"/>
+      <feature id="org.wso2.developerstudio.kernel.wso2plugins.samples.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.capp.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.carbon.server.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.carbon.server-40.feature" installMode="root"/>
@@ -353,49 +351,31 @@ Please visit : http://wso2.com/products/developer-studio/
       <feature id="org.wso2.developerstudio.mvn.multimodule.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.cloud.utils.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.web.ui.feature" installMode="root"/>
-      <!-- Dev studio ESB features -->
       <feature id="org.wso2.developerstudio.eclipse.esb.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.eclipse.esb.editor.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.eclipse.esb.dependencies.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.eclipse.visualdatamapper.editor.feature" installMode="root"/>
-      <!--<feature id="org.wso2.developerstudio.eclipse.smooks.editor.feature" installMode="root"/>-->
-      <feature id="org.wso2.developerstudio.eclipse.apim.endpoint.central.feature" installMode="root"/>
-      <!-- Dev studio BPS features -->
-      <feature id="org.wso2.developerstudio.eclipse.bps.feature" installMode="root"/>
-      <feature id="org.wso2.developerstudio.eclipse.bps.hteditor.feature" installMode="root"/>
-      <feature id="org.wso2.developerstudio.eclipse.bps.bpmn.feature" installMode="root"/>
-      <!-- Dev studio DSS features -->
       <feature id="org.wso2.developerstudio.eclipse.data.service.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.eclipse.data.source.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.eclipse.dss.dependencies.feature" installMode="root"/>
-      <!-- Dev studio EI features -->
       <feature id="org.wso2.developerstudio.eclipse.ei.project.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.eclipse.docker.distribution.feature" installMode="root"/>
       <feature id="org.wso2.developerstudio.carbon.server-44microei.feature" installMode="root"/>
    </features>
 
    <configurations>
+      <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
       <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
-      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
    </configurations>
 
    <repositories>
+      <repository location="http://download.eclipse.org/releases/2020-06/" enabled="true" />
       <repository location="http://product-dist.wso2.com/p2/developer-studio-kernel/4.3.0/updates/" enabled="true" />
       <repository location="http://product-dist.wso2.com/p2/developer-studio-kernel/4.3.0/releases/" enabled="true" />
-      <repository location="http://download.eclipse.org/releases/oxygen" enabled="true" />
-      <repository location="http://download.eclipse.org/releases/oxygen" enabled="true" />
-      <repository location="http://product-dist.wso2.com/p2/developer-studio-kernel/4.3.0/updates/" enabled="true" />
-      <repository location="http://product-dist.wso2.com/p2/developer-studio-kernel/4.3.0/releases/" enabled="true" />
-      <repository location="http://download.eclipse.org/releases/oxygen" enabled="true" />
-      <repository location="http://download.eclipse.org/releases/oxygen" enabled="true" />
-      <repository location="http://product-dist.wso2.com/p2/developer-studio-kernel/4.3.0/updates/" enabled="true" />
-      <repository location="http://product-dist.wso2.com/p2/developer-studio-kernel/4.3.0/releases/" enabled="true" />
-      <repository location="http://download.eclipse.org/releases/oxygen" enabled="true" />
-      <repository location="http://download.eclipse.org/releases/oxygen" enabled="true" />
+      <repository location="http://download.eclipse.org/releases/2020-06" enabled="true" />
    </repositories>
 
    <preferencesInfo>
diff --git a/repository/pom.xml b/repository/pom.xml
index 9c49c2734..f5c612a1b 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -25,6 +25,6 @@
     <url>http://wso2.org</url>
 	<modules>
 	<module>main</module>
-	<module>composite</module>
+	<!-- <module>composite</module> -->
     </modules>
 </project>