diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index 2af549992c6..96a32130a20 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -48,7 +48,7 @@ PREVIOUS_RELEASE_ID="R-4.35-202502280140"
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/snapshots"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.37.0/R-3.37.0-20250303081219/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.36-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.36/R-4.36-202505281830/"
 
 #Maven parameters
 JAVA_DOC_TOOL="-Declipse.javadoc=/opt/tools/java/openjdk/jdk-17/latest/bin/javadoc"
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index e50ce104f13..a33a1bf6ad0 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -78,7 +78,7 @@
     <cbi-plugins.version>1.5.2</cbi-plugins.version>
     <surefire.version>3.5.3</surefire.version>
 
-    <eclipse-sdk-repo>https://download.eclipse.org/eclipse/updates/${releaseVersion}-I-builds/</eclipse-sdk-repo>
+    <eclipse-sdk-repo>https://download.eclipse.org/eclipse/updates/4.36/R-4.36-202505281830/</eclipse-sdk-repo>
 
     <!--  
       The tycho-eclipserun-plugin will create its instance of Eclipse from this
@@ -131,7 +131,7 @@
     <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
     <version.baseline.check.skip>${compare-version-with-baselines.skip}</version.baseline.check.skip> <!-- Allows projects to overwrite the value set on the CLI to skip the check in any case. -->
     <tycho.baseline.replace>all</tycho.baseline.replace>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.35/R-4.35-202502280140/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.36/R-4.36-202505281830/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.