diff --git a/cje-production/streams/repositories_java20.txt b/cje-production/streams/repositories_java20.txt
index 44e12c4579f..8095c9c7008 100644
--- a/cje-production/streams/repositories_java20.txt
+++ b/cje-production/streams/repositories_java20.txt
@@ -5,7 +5,7 @@ eclipse.jdt: master
 eclipse.jdt.core.binaries: master
 eclipse.jdt.core: BETA_JAVA20
 eclipse.jdt.debug: BETA_JAVA20
-eclipse.jdt.ui: master
+eclipse.jdt.ui: BETA_JAVA20
 eclipse.pde: master
 eclipse.platform.debug: master
 eclipse.platform.resources: master
diff --git a/cje-production/streams/repositories_java20patch.txt b/cje-production/streams/repositories_java20patch.txt
index 84863a28820..4df1a0bef52 100644
--- a/cje-production/streams/repositories_java20patch.txt
+++ b/cje-production/streams/repositories_java20patch.txt
@@ -1,3 +1,3 @@
 eclipse.jdt.core: BETA_JAVA20
-eclipse.jdt.ui: master
+eclipse.jdt.ui: BETA_JAVA20
 eclipse.jdt.debug: BETA_JAVA20
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index ea646f69b94..e24e5f28fa7 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -604,16 +604,16 @@
           https://wiki.eclipse.org/Java20
         -->
         <!-- This needs the version of the feature to be patched. -->
-        <featureToPatchVersion>3.19.0.v20230104-1800</featureToPatchVersion>
+        <featureToPatchVersion>3.19.0.v20230302-0300</featureToPatchVersion>
         <!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
-        <versionRangeForPatch>[3.19.0.v20230104-1800,3.19.49.v20230604-1800)</versionRangeForPatch>
+        <versionRangeForPatch>[3.19.0.v20230302-0300,3.19.49.v20230604-1800)</versionRangeForPatch>
         <!-- Comment this line when a patch is required on top of I-build -->
-        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.27-I-builds/I20230104-1800/</comparator.repo>
+        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.27-I-builds/I20230302-0300/</comparator.repo>
       </properties>
       <repositories>
        <repository>
          <id>eclipse-p2-repo-java20patch</id>
-         <url>https://download.eclipse.org/eclipse/updates/4.27-I-builds/I20230104-1800/</url>
+         <url>https://download.eclipse.org/eclipse/updates/4.27-I-builds/I20230302-0300/</url>
          <layout>p2</layout>
        </repository>
      </repositories>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt-feature-dummy/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt-feature-dummy/feature.xml
index 24ec072179f..2465e1a8f5e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt-feature-dummy/feature.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt-feature-dummy/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jdt"
       label="%featureName"
-      version="3.19.0.v20230104-1800"
+      version="3.19.0.v20230302-0300"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt-feature-dummy/pom.xml
index 8464e0186a6..4ea21698145 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt-feature-dummy/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt-feature-dummy/pom.xml
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt.feature</groupId>
   <artifactId>org.eclipse.jdt</artifactId>
-  <version>3.19.0.v20230104-1800</version>
+  <version>3.19.0.v20230302-0300</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt.java20patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt.java20patch/feature.xml
index 108dd628426..d93bb919ad0 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt.java20patch/feature.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt.java20patch/feature.xml
@@ -20,7 +20,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.jdt" version="3.19.0.v20230104-1800" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.19.0.v20230302-0300" patch="true"/>
    </requires>
 
    <plugin
@@ -47,5 +47,23 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+   <plugin
+         id="org.eclipse.jdt.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+   <plugin
+         id="org.eclipse.jdt.core.manipulation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>    
+   <plugin
+         id="org.eclipse.jdt.astview"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>        
    
 </feature>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java20patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java20patch/pom.xml
index b0da21e9eef..bcd177c24dd 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java20patch/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java20patch/pom.xml
@@ -40,6 +40,9 @@
     <module>../../eclipse.jdt.core/org.eclipse.jdt.core.compiler.batch</module>
     <module>../../eclipse.jdt.debug/org.eclipse.jdt.debug</module>
     <module>../../eclipse.jdt.debug/org.eclipse.jdt.launching</module>
+    <module>../../eclipse.jdt.ui/org.eclipse.jdt.ui</module>
+    <module>../../eclipse.jdt.ui/org.eclipse.jdt.core.manipulation</module>
+    <module>../../eclipse.jdt.ui/org.eclipse.jdt.astview</module>
     <module>org.eclipse.jdt.java20patch</module>
     <module>eclipse.releng.repository.java20patch</module>
   </modules>