diff --git a/setups/org.eclipse.all.product.setup b/setups/org.eclipse.all.product.setup
index c05cbfb..0ebd102 100644
--- a/setups/org.eclipse.all.product.setup
+++ b/setups/org.eclipse.all.product.setup
@@ -48,19 +48,11 @@
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
-          key="siteURI">
-        <value>https://www.eclipse.org/downloads/packages/release/2023-03/r</value>
-      </detail>
-      <detail
           key="shortcut">
         <value>Eclipse Eierlegende Wollmilchsau - Latest</value>
       </detail>
     </annotation>
     <setupTask
-        xsi:type="setup:RedirectionTask"
-        sourceURL="https://download.eclipse.org/releases/2023-06"
-        targetURL="https://download.eclipse.org/releases/2023-03"/>
-    <setupTask
         xsi:type="setup.p2:P2Task"
         label="Eclipse Eierlegende Wollmilchsau (2023-06)">
       <requirement
@@ -162,19 +154,11 @@
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
-          key="siteURI">
-        <value>https://www.eclipse.org/downloads/packages/release/2023-03/r</value>
-      </detail>
-      <detail
           key="shortcut">
         <value>Eclipse Eierlegende Wollmilchsau - 2023-06</value>
       </detail>
     </annotation>
     <setupTask
-        xsi:type="setup:RedirectionTask"
-        sourceURL="https://download.eclipse.org/releases/2023-06"
-        targetURL="https://download.eclipse.org/releases/2023-03"/>
-    <setupTask
         xsi:type="setup.p2:P2Task"
         label="Eclipse Eierlegende Wollmilchsau (2023-06)">
       <requirement
diff --git a/setups/org.eclipse.platform.sdk.product.setup b/setups/org.eclipse.platform.sdk.product.setup
index 271caaf..3fed74d 100644
--- a/setups/org.eclipse.platform.sdk.product.setup
+++ b/setups/org.eclipse.platform.sdk.product.setup
@@ -53,14 +53,10 @@
       vm="true"/>
   <version name="latest"
       label="Latest (4.28 - 2023-06)"
-      requiredJavaVersion="11">
+      requiredJavaVersion="17">
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
-          key="siteURI">
-        <value>https://download.eclipse.org/eclipse/downloads/</value>
-      </detail>
-      <detail
           key="shortcut">
         <value>Eclipse SDK - Latest</value>
       </detail>
@@ -83,7 +79,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>https://download.eclipse.org/eclipse/downloads/</value>
+        <value>https://archive.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/</value>
       </detail>
       <detail
           key="shortcut">
@@ -103,14 +99,10 @@
   </version>
   <version name="4.28"
       label="4.28 - 2023-06"
-      requiredJavaVersion="11">
+      requiredJavaVersion="17">
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
-          key="siteURI">
-        <value>https://download.eclipse.org/eclipse/downloads/</value>
-      </detail>
-      <detail
           key="shortcut">
         <value>Eclipse SDK - 4.28 - 2023-06</value>
       </detail>
@@ -137,7 +129,7 @@
       </detail>
       <detail
           key="siteURI">
-        <value>https://download.eclipse.org/eclipse/downloads/</value>
+        <value>https://archive.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/</value>
       </detail>
       <detail
           key="shortcut">
diff --git a/setups/org.eclipse.products.setup b/setups/org.eclipse.products.setup
index c45d255..61abb65 100644
--- a/setups/org.eclipse.products.setup
+++ b/setups/org.eclipse.products.setup
@@ -71,19 +71,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-java-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Java Developers - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Java Developers (2023-06)">
         <requirement
@@ -105,6 +97,8 @@
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jdt.feature.group"/>
         <requirement
             name="org.eclipse.jgit.feature.group"/>
@@ -123,6 +117,8 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -201,19 +197,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-java-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Java Developers - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Java Developers (2023-06)">
         <requirement
@@ -235,6 +223,8 @@
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jdt.feature.group"/>
         <requirement
             name="org.eclipse.jgit.feature.group"/>
@@ -253,6 +243,8 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -2071,19 +2063,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-enterprise-java-and-web-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Enterprise Java and Web Developers - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Enterprise Java and Web Developers (2023-06)">
         <requirement
@@ -2177,6 +2161,8 @@
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jdt.feature.group"/>
         <requirement
             name="org.eclipse.jgit.feature.group"/>
@@ -2253,6 +2239,8 @@
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -2461,19 +2449,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-enterprise-java-and-web-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Enterprise Java and Web Developers - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Enterprise Java and Web Developers (2023-06)">
         <requirement
@@ -2567,6 +2547,8 @@
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jdt.feature.group"/>
         <requirement
             name="org.eclipse.jgit.feature.group"/>
@@ -2643,6 +2625,8 @@
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -7323,19 +7307,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-cc-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for C and C++ Developers - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for C/C++ Developers (2023-06)">
         <requirement
@@ -7411,6 +7387,8 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -7523,19 +7501,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-cc-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for C and C++ Developers - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for C/C++ Developers (2023-06)">
         <requirement
@@ -7611,6 +7581,8 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -10146,19 +10118,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-embedded-cc-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Embedded C and C++ Developers - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Embedded C/C++ Developers (2023-06)">
         <requirement
@@ -10266,6 +10230,8 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -10410,19 +10376,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-embedded-cc-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Embedded C and C++ Developers - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Embedded C/C++ Developers (2023-06)">
         <requirement
@@ -10530,6 +10488,8 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -11892,19 +11852,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-php-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for PHP Developers - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for PHP Developers (2023-06)">
         <requirement
@@ -11946,6 +11898,8 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -12024,19 +11978,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-php-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for PHP Developers - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for PHP Developers (2023-06)">
         <requirement
@@ -12078,6 +12024,8 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -13867,19 +13815,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-eclipse-committers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Eclipse Committers - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Eclipse Committers (2023-06)">
         <requirement
@@ -13905,6 +13845,8 @@
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jdt.feature.group"/>
         <requirement
             name="org.eclipse.jdt.source.feature.group"/>
@@ -13937,6 +13879,8 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -14033,19 +13977,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-eclipse-committers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Eclipse Committers - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Eclipse Committers (2023-06)">
         <requirement
@@ -14071,6 +14007,8 @@
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jdt.feature.group"/>
         <requirement
             name="org.eclipse.jdt.source.feature.group"/>
@@ -14103,6 +14041,8 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -16599,19 +16539,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-java-and-dsl-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Java and DSL Developers - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse DSL Tools (2023-06)">
         <requirement
@@ -16657,6 +16589,8 @@
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -16739,19 +16673,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-java-and-dsl-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Java and DSL Developers - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse DSL Tools (2023-06)">
         <requirement
@@ -16797,6 +16723,8 @@
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -18373,19 +18301,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-rcp-and-rap-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for RCP and RAP Developers - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse for RCP and RAP Developers (2023-06)">
         <requirement
@@ -18417,6 +18337,8 @@
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jgit.feature.group"/>
         <requirement
             name="org.eclipse.m2e.feature.feature.group"/>
@@ -18443,6 +18365,8 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -18539,19 +18463,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-rcp-and-rap-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for RCP and RAP Developers - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse for RCP and RAP Developers (2023-06)">
         <requirement
@@ -18583,6 +18499,8 @@
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jgit.feature.group"/>
         <requirement
             name="org.eclipse.m2e.feature.feature.group"/>
@@ -18609,6 +18527,8 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -20769,19 +20689,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-modeling-tools</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse Modeling Tools - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse Modeling Tools (2023-06)">
         <requirement
@@ -20831,6 +20743,8 @@
         <requirement
             name="org.eclipse.gmf.runtime.sdk.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jdt.feature.group"/>
         <requirement
             name="org.eclipse.jgit.feature.group"/>
@@ -20851,6 +20765,8 @@
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -20959,19 +20875,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-modeling-tools</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse Modeling Tools - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse Modeling Tools (2023-06)">
         <requirement
@@ -21021,6 +20929,8 @@
         <requirement
             name="org.eclipse.gmf.runtime.sdk.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jdt.feature.group"/>
         <requirement
             name="org.eclipse.jgit.feature.group"/>
@@ -21041,6 +20951,8 @@
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -23469,19 +23381,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-scientific-computing</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Scientific Computing - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse for Scientific Computing (2023-06)">
         <requirement
@@ -23539,6 +23443,8 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -23633,19 +23539,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-scientific-computing</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Scientific Computing - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse for Scientific Computing (2023-06)">
         <requirement
@@ -23703,6 +23601,8 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -25884,19 +25784,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-scout-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Scout Developers - Latest</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse for Scout Developers (2023-06)">
         <requirement
@@ -25916,6 +25808,8 @@
         <requirement
             name="org.eclipse.help.source.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jdt.feature.group"/>
         <requirement
             name="org.eclipse.jdt.source.feature.group"/>
@@ -25938,6 +25832,8 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -26018,19 +25914,11 @@
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2023-03/r/eclipse-ide-scout-developers</value>
-        </detail>
-        <detail
             key="shortcut">
           <value>Eclipse IDE for Scout Developers - 2023-06</value>
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse for Scout Developers (2023-06)">
         <requirement
@@ -26050,6 +25938,8 @@
         <requirement
             name="org.eclipse.help.source.feature.group"/>
         <requirement
+            name="org.eclipse.jdt.bcoview.feature.feature.group"/>
+        <requirement
             name="org.eclipse.jdt.feature.group"/>
         <requirement
             name="org.eclipse.jdt.source.feature.group"/>
@@ -26072,6 +25962,8 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
+            url="https://download.eclipse.org/technology/epp/packages/2023-06"/>
+        <repository
             url="https://download.eclipse.org/releases/2023-06">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
@@ -30673,10 +30565,6 @@
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse Platform (2023-06)">
         <requirement
@@ -30704,7 +30592,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://download.eclipse.org/eclipse/downloads/</value>
+          <value>https://archive.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/</value>
         </detail>
         <detail
             key="shortcut">
@@ -30743,10 +30631,6 @@
         </detail>
       </annotation>
       <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2023-06"
-          targetURL="https://download.eclipse.org/releases/2023-03"/>
-      <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse Platform (2023-06)">
         <requirement
@@ -30778,7 +30662,7 @@
         </detail>
         <detail
             key="siteURI">
-          <value>https://download.eclipse.org/eclipse/downloads/</value>
+          <value>https://archive.eclipse.org/eclipse/downloads/drops4/R-4.27-202303020300/</value>
         </detail>
         <detail
             key="shortcut">