diff --git a/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target b/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target
index d2159a1..ddf29d5 100644
--- a/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target
+++ b/core/releng/org.eclipse.dltk.core.targetplatform/org.eclipse.dltk.core.targetplatform.target
@@ -24,24 +24,65 @@
             <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
             <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
             <unit id="org.eclipse.rse.feature.group" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/releases/2022-03"/>
+            <unit id="javax.annotation" version="0.0.0"/>
+            <unit id="javax.inject" version="0.0.0"/>
+            <unit id="org.apache.felix.scr" version="0.0.0"/>
+            <unit id="org.slf4j.api" version="0.0.0"/>
+            <unit id="com.sun.jna" version="0.0.0"/>
+            <unit id="org.eclipse.e4.emf.xpath" version="0.0.0"/>
+            <unit id="org.eclipse.fx.osgi" version="0.0.0"/>
+            <unit id="org.apache.commons.jxpath" version="0.0.0"/>
+            <unit id="org.apache.xmlgraphics" version="0.0.0"/>
+            <unit id="org.apache.commons.io" version="0.0.0"/>
+            <unit id="org.apache.commons.logging" version="0.0.0"/>
+            <unit id="org.eclipse.urischeme" version="0.0.0"/>
+            <unit id="com.sun.jna.platform" version="0.0.0"/>
+            <unit id="org.apache.commons.lang" version="0.0.0"/>
+            <unit id="org.apache.commons.codec" version="0.0.0"/>
+            <unit id="org.apache.commons.httpclient" version="0.0.0"/>
+            <unit id="org.apache.xerces" version="0.0.0"/>
+            <unit id="org.apache.xml.resolver" version="0.0.0"/>
+            <unit id="com.sun.xml.bind" version="0.0.0"/>
+            <unit id="javax.xml" version="0.0.0"/>
+            <unit id="org.apache.httpcomponents.httpcore" version="0.0.0"/>
+            <unit id="org.apache.httpcomponents.httpclient" version="0.0.0"/>
+            <unit id="org.apache.xmlrpc.client" version="0.0.0"/>
+            <unit id="org.apache.xmlrpc.common" version="0.0.0"/>
+            <unit id="org.apache.ws.commons.util" version="0.0.0"/>
+            <unit id="org.sat4j.core" version="0.0.0"/>
+            <unit id="org.sat4j.pb" version="0.0.0"/>
+            
+            <repository location="https://download.eclipse.org/releases/2023-06"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
-            <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
-            <unit id="org.eclipse.mylyn.context.sdk.feature.group" version="0.0.0"/>
-            <unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/>
-            <unit id="org.apache.lucene.lucene-analysis-common" version="0.0.0"/>
-            <unit id="org.apache.lucene.lucene-core" version="0.0.0"/>
-            <unit id="org.apache.lucene.lucene-queries" version="0.0.0"/>
-            <unit id="org.apache.lucene.lucene-queryparser" version="0.0.0"/>
-            <unit id="org.apache.lucene.lucene-sandbox" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.commons.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.commons.identity.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.commons.activity.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.commons.notifications.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.commons.repositories.feature.feature.group" version="0.0.0"/>
+            
+            <unit id="org.eclipse.mylyn.context.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.ide.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.monitor.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.context.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.discovery.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.tasks.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.mylyn.team.feature.feature.group" version="0.0.0"/>
+            
+            <unit id="org.apache.lucene.analysis-common" version="0.0.0"/>
+            <unit id="org.apache.lucene.core" version="0.0.0"/>
+            <unit id="org.apache.lucene.queries" version="0.0.0"/>
+            <unit id="org.apache.lucene.queryparser" version="0.0.0"/>
+            <unit id="org.apache.lucene.sandbox" version="0.0.0"/>
             <unit id="com.sun.xml.bind" version="0.0.0"/>
             <unit id="jakarta.xml.bind" version="0.0.0"/>
+            <unit id="javax.xml.stream" version="0.0.0"/>
+            <unit id="com.google.guava" version="0.0.0"/>
+            <unit id="com.google.guava.failureaccess" version="0.0.0"/>
             
             <unit id="javax.xml.stream" version="0.0.0"/>
-            <unit id="javax.xml" version="0.0.0"/>
-            <repository location="https://download.eclipse.org/mylyn/releases/latest/"/>
-        </location>com.sun.xml.bind
+            <repository location="https://download.eclipse.org/mylyn/updates/milestone/latest/"/>
+        </location>
         <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
 			<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/cbi/updates/license"/>
diff --git a/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml b/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml
index 78878c4..a7c6a12 100644
--- a/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml
+++ b/mylyn/features/org.eclipse.dltk.mylyn-feature/feature.xml
@@ -44,8 +44,8 @@
 
    <requires>
       <import feature="org.eclipse.dltk.core" version="6.0.0" match="compatible"/>
-      <import feature="org.eclipse.mylyn.context_feature" version="3.0.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.mylyn_feature" version="3.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.mylyn.context.feature" version="3.0.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.mylyn.ide.feature" version="3.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin