diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2024-06.target b/releng/org.eclipse.ecf.releng.target/ecf-2024-06.target
index 0cd0cabcf..c1c02033f 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-2024-06.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-2024-06.target
@@ -69,7 +69,7 @@
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/eclipse/updates/4.32-I-builds"/>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.32/R-4.32-202406010610"/>
     </location>
   </locations>
 </target>
diff --git a/releng/org.eclipse.ecf.releng/ECF.setup b/releng/org.eclipse.ecf.releng/ECF.setup
index ce365132c..47211b213 100644
--- a/releng/org.eclipse.ecf.releng/ECF.setup
+++ b/releng/org.eclipse.ecf.releng/ECF.setup
@@ -510,6 +510,126 @@
       </predicate>
     </workingSet>
   </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin.console/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/releng/features/org.eclipse.ecf.filetransfer.httpclient45.feature/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45.win32/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/releng/features/org.eclipse.ecf.filetransfer.httpclient5.feature/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient5/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/releng/features/org.eclipse.ecf.filetransfer.httpclientjava.feature/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclientjava/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpclientjava/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/releng/features/org.eclipse.ecf.remoteservices.tooling.bndtools.feature/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:TextModifyTask"
+      excludedTriggers="BOOTSTRAP"
+      url="${github.clone.ecf.location|uri}/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.bndtools/.project"
+      encoding="UTF-8">
+    <modification
+        pattern="(?im)(^[^&lt;].*maven.*$)">
+      <substitution>&lt;!-- \1 --></substitution>
+    </modification>
+  </setupTask>
   <stream name="master"
       label="Master">
     <setupTask