diff --git a/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch b/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
index 0c0f84c4f..2a861aaf6 100644
--- a/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
+++ b/plugins/org.eclipse.oomph.setup.installer/ProductCatalogGenerator.launch
@@ -29,7 +29,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog &#13;&#10;-outputLocation ${file_uri:${resource_loc:/setups/org.eclipse.products.setup}}&#13;&#10;-staging 2023-12&#13;&#10;https://download.eclipse.org/technology/epp/packages/2023-12/202312011200&#13;&#10;https://download.eclipse.org/releases/2023-12/202312061001&#13;&#10;https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110&#13;&#10;-useComposite 2024-03&#13;&#10;-xlatestReleased&#13;&#10;-fakeNextRelease&#13;&#10;-brandingNotification&#13;&#10;-siteURI https://www.eclipse.org/downloads/packages/release/2023-12/r&#13;&#10;-xupdateCertificates&#13;&#10;-actual"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog &#13;&#10;-outputLocation ${file_uri:${resource_loc:/setups/org.eclipse.products.setup}}&#13;&#10;-staging 2023-12&#13;&#10;https://download.eclipse.org/technology/epp/packages/2023-12/202312011200&#13;&#10;https://download.eclipse.org/releases/2023-12/202312061001&#13;&#10;https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110&#13;&#10;-useComposite 2024-03&#13;&#10;-xlatestReleased&#13;&#10;-xfakeNextRelease&#13;&#10;-brandingNotification&#13;&#10;-siteURI https://www.eclipse.org/downloads/packages/release/2023-12/r&#13;&#10;-xupdateCertificates&#13;&#10;-actual"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.p2.mirrors=false&#13;&#10;-Dxorg.eclipse.ecf.provider.filetransfer.excludeContributors=org.eclipse.ecf.provider.filetransfer.httpclient45&#13;&#10;-Doomph.p2.repository.retry=2&#13;&#10;-Dxorg.eclipse.ecf.core.util.traceAll=true&#13;&#10;-Dxorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog&#13;&#10;-Dxorg.apache.commons.logging.simplelog.showdatetime=true&#13;&#10;-Dxorg.apache.commons.logging.simplelog.log.org.apache.http=DEBUG&#13;&#10;-Dxorg.apache.commons.logging.simplelog.log.org.apache.http.wire=ERROR&#13;&#10;-Duser.home=${system_property:user.home}"/>
     <stringAttribute key="pde.version" value="3.3"/>
diff --git a/setups/Oomph.setup b/setups/Oomph.setup
index 537278f5b..1ff9636bd 100644
--- a/setups/Oomph.setup
+++ b/setups/Oomph.setup
@@ -51,6 +51,8 @@
         name="org.eclipse.swtbot.eclipse.test.junit.feature.group"/>
     <requirement
         name="org.eclipse.oomph.setup.launching.feature.group"/>
+    <requirement
+        name="org.eclipse.oomph.preferences.feature.group"/>
     <repository
         url="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest"/>
     <repository
diff --git a/setups/org.eclipse.all.product.setup b/setups/org.eclipse.all.product.setup
index ec76c5b18..7876b88e7 100644
--- a/setups/org.eclipse.all.product.setup
+++ b/setups/org.eclipse.all.product.setup
@@ -56,10 +56,6 @@
         <value>Eclipse Eierlegende Wollmilchsau - Latest</value>
       </detail>
     </annotation>
-    <setupTask
-        xsi:type="setup:RedirectionTask"
-        sourceURL="https://download.eclipse.org/releases/2024-03"
-        targetURL="https://download.eclipse.org/releases/2023-12"/>
     <setupTask
         xsi:type="setup.p2:P2Task"
         label="Eclipse Eierlegende Wollmilchsau (2024-03)">
@@ -170,10 +166,6 @@
         <value>Eclipse Eierlegende Wollmilchsau - 2024-03</value>
       </detail>
     </annotation>
-    <setupTask
-        xsi:type="setup:RedirectionTask"
-        sourceURL="https://download.eclipse.org/staging/2024-03"
-        targetURL="https://download.eclipse.org/staging/2023-12"/>
     <setupTask
         xsi:type="setup.p2:P2Task"
         label="Eclipse Eierlegende Wollmilchsau (2024-03)">
@@ -226,10 +218,6 @@
         <value>Eclipse Eierlegende Wollmilchsau - 2024-03</value>
       </detail>
     </annotation>
-    <setupTask
-        xsi:type="setup:RedirectionTask"
-        sourceURL="https://download.eclipse.org/releases/2024-03"
-        targetURL="https://download.eclipse.org/releases/2023-12"/>
     <setupTask
         xsi:type="setup.p2:P2Task"
         label="Eclipse Eierlegende Wollmilchsau (2024-03)">
diff --git a/setups/org.eclipse.products.setup b/setups/org.eclipse.products.setup
index 6b2ee8cb0..188bc6648 100644
--- a/setups/org.eclipse.products.setup
+++ b/setups/org.eclipse.products.setup
@@ -79,10 +79,6 @@
           <value>Eclipse IDE for Java Developers - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Java Developers (2024-03)">
@@ -140,6 +136,8 @@
             name="org.eclipse.tm.terminal.feature.feature.group"/>
         <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -243,10 +241,6 @@
           <value>Eclipse IDE for Java Developers - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Java Developers (2024-03)">
@@ -304,6 +298,8 @@
             name="org.eclipse.tm.terminal.feature.feature.group"/>
         <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -2462,10 +2458,6 @@
           <value>Eclipse IDE for Enterprise Java and Web Developers - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Enterprise Java and Web Developers (2024-03)">
@@ -2655,6 +2647,8 @@
             name="org.eclipse.wst.server_adapters.feature.feature.group"/>
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -2890,10 +2884,6 @@
           <value>Eclipse IDE for Enterprise Java and Web Developers - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Enterprise Java and Web Developers (2024-03)">
@@ -3083,6 +3073,8 @@
             name="org.eclipse.wst.server_adapters.feature.feature.group"/>
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -8499,10 +8491,6 @@
           <value>Eclipse IDE for C and C++ Developers - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for C/C++ Developers (2024-03)">
@@ -8594,6 +8582,8 @@
             name="org.eclipse.tracecompass.lttng2.kernel.feature.group"/>
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -8731,10 +8721,6 @@
           <value>Eclipse IDE for C and C++ Developers - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for C/C++ Developers (2024-03)">
@@ -8826,6 +8812,8 @@
             name="org.eclipse.tracecompass.lttng2.kernel.feature.group"/>
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -11803,10 +11791,6 @@
           <value>Eclipse IDE for Embedded C and C++ Developers - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Embedded C/C++ Developers (2024-03)">
@@ -11930,6 +11914,8 @@
             name="org.eclipse.tracecompass.lttng2.kernel.feature.group"/>
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -12099,10 +12085,6 @@
           <value>Eclipse IDE for Embedded C and C++ Developers - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Embedded C/C++ Developers (2024-03)">
@@ -12226,6 +12208,8 @@
             name="org.eclipse.tracecompass.lttng2.kernel.feature.group"/>
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -14126,10 +14110,6 @@
           <value>Eclipse IDE for PHP Developers - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for PHP Developers (2024-03)">
@@ -14187,6 +14167,8 @@
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -14290,10 +14272,6 @@
           <value>Eclipse IDE for PHP Developers - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for PHP Developers (2024-03)">
@@ -14351,6 +14329,8 @@
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -16480,10 +16460,6 @@
           <value>Eclipse IDE for Eclipse Committers - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Eclipse Committers (2024-03)">
@@ -16565,6 +16541,8 @@
             name="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group"/>
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -16692,10 +16670,6 @@
           <value>Eclipse IDE for Eclipse Committers - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Eclipse Committers (2024-03)">
@@ -16777,6 +16751,8 @@
             name="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group"/>
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -19685,10 +19661,6 @@
           <value>Eclipse IDE for Java and DSL Developers - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse DSL Tools (2024-03)">
@@ -19734,6 +19706,8 @@
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -19825,10 +19799,6 @@
           <value>Eclipse IDE for Java and DSL Developers - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse DSL Tools (2024-03)">
@@ -19874,6 +19844,8 @@
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -21678,10 +21650,6 @@
           <value>Eclipse IDE for RCP and RAP Developers - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse for RCP and RAP Developers (2024-03)">
@@ -21761,6 +21729,8 @@
             name="org.eclipse.tm.terminal.feature.feature.group"/>
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -21886,10 +21856,6 @@
           <value>Eclipse IDE for RCP and RAP Developers - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse for RCP and RAP Developers (2024-03)">
@@ -21969,6 +21935,8 @@
             name="org.eclipse.tm.terminal.feature.feature.group"/>
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -24535,10 +24503,6 @@
           <value>Eclipse Modeling Tools - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse Modeling Tools (2024-03)">
@@ -24630,6 +24594,8 @@
             name="org.eclipse.uml2.sdk.feature.group"/>
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -24767,10 +24733,6 @@
           <value>Eclipse Modeling Tools - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse Modeling Tools (2024-03)">
@@ -24862,6 +24824,8 @@
             name="org.eclipse.uml2.sdk.feature.group"/>
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -27732,10 +27696,6 @@
           <value>Eclipse IDE for Scout Developers - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse for Scout Developers (2024-03)">
@@ -27795,6 +27755,8 @@
             name="org.eclipse.wst.web_ui.feature.feature.group"/>
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -27900,10 +27862,6 @@
           <value>Eclipse IDE for Scout Developers - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse for Scout Developers (2024-03)">
@@ -27963,6 +27921,8 @@
             name="org.eclipse.wst.web_ui.feature.feature.group"/>
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+        <repository
+            url="https://download.eclipse.org/technology/epp/packages/2024-03"/>
         <repository
             url="https://download.eclipse.org/releases/2024-03">
           <annotation
@@ -30105,10 +30065,6 @@
           <value>Eclipse Platform - Latest</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse Platform (2024-03)">
@@ -30175,10 +30131,6 @@
           <value>Eclipse Platform - 2024-03</value>
         </detail>
       </annotation>
-      <setupTask
-          xsi:type="setup:RedirectionTask"
-          sourceURL="https://download.eclipse.org/releases/2024-03"
-          targetURL="https://download.eclipse.org/releases/2023-12"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
           label="Eclipse Platform (2024-03)">