diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index 1ecfda491db..8f43ece48b4 100644
--- a/cje-production/buildproperties.txt
+++ b/cje-production/buildproperties.txt
@@ -18,10 +18,10 @@
 
 # CJE build variables
 BRANCH="master"
-RELEASE_VER="4.36"
-STREAM="4.36.0"
+RELEASE_VER="4.37"
+STREAM="4.37.0"
 STREAMMajor="4"
-STREAMMinor="36"
+STREAMMinor="37"
 STREAMService="0"
 GIT_ROOT="git@github.com:"
 AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git"
@@ -38,12 +38,12 @@ LOCAL_REPO="localMavenRepo"
 BASEBUILDER_TAG="4.35"
 API_PREV_REF_LABEL="4.35"
 
-PREVIOUS_RELEASE_VER="4.35"
-PREVIOUS_RELEASE_REPO_ID="4.35"
+PREVIOUS_RELEASE_VER="4.36RC2"
+PREVIOUS_RELEASE_REPO_ID="4.36-I-builds"
 #build id for getting repo
-BASEBUILD_ID="R-4.35-202502280140"
+BASEBUILD_ID="I20250528-1830"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.35-202502280140"
+PREVIOUS_RELEASE_ID="S-4.36RC2-202505281830"
 
 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/"
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index e50ce104f13..3bcc1e94a03 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse</groupId>
   <artifactId>eclipse-platform-parent</artifactId>
-  <version>4.36.0-SNAPSHOT</version>
+  <version>4.37.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <!--
     See maven-enforcer-plugin configuration to actually break the build if
@@ -46,7 +46,7 @@
 
     <!-- releaseYear is used in copyright statements, etc.-->
     <releaseYear>2025</releaseYear>
-    <releaseMonth>06</releaseMonth>
+    <releaseMonth>09</releaseMonth>
      <!--
       releaseName should match the yearly "release train" name.
       For example, "Mars", "Mars.1", "Luna SR2", etc.
@@ -55,7 +55,7 @@
       See bug 328139.
     -->
     <releaseName>${releaseYear}-${releaseMonth}</releaseName>
-    <releaseVersion>4.36</releaseVersion>
+    <releaseVersion>4.37</releaseVersion>
     <!--
       The releaseNumbers below, for SDK and Platform, might be
       thought of as the "marketing number" or "branding number",
@@ -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-I-builds/I20250528-1830/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
@@ -209,7 +209,7 @@
             <artifact>
               <groupId>org.eclipse</groupId>
               <artifactId>eclipse-sdk-prereqs</artifactId>
-              <version>4.36.0-SNAPSHOT</version>
+              <version>4.37.0-SNAPSHOT</version>
             </artifact>
           </target>
           <environments>
diff --git a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
index 177c074f177..ee90ebf7b8a 100644
--- a/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
+++ b/eclipse.platform.common/bundles/org.eclipse.jdt.doc.isv/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.common</artifactId>
     <groupId>eclipse.platform.common</groupId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF
index 9d638194d94..a0c4555a48d 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.platform.doc.isv; singleton:=true
-Bundle-Version: 4.36.0.qualifier
+Bundle-Version: 4.37.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
index f1da15568c2..a15193e481b 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.platform.common</artifactId>
     <groupId>eclipse.platform.common</groupId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.platform</groupId>
diff --git a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF
index 9ada40c5663..f67b53b6770 100644
--- a/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF
+++ b/eclipse.platform.common/bundles/org.eclipse.platform.doc.user/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.platform.doc.user; singleton:=true
-Bundle-Version: 4.36.0.qualifier
+Bundle-Version: 4.37.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
diff --git a/eclipse.platform.common/pom.xml b/eclipse.platform.common/pom.xml
index bb09f335f11..fbef9e43860 100644
--- a/eclipse.platform.common/pom.xml
+++ b/eclipse.platform.common/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>
 
diff --git a/eclipse.platform.releng.prereqs.sdk/pom.xml b/eclipse.platform.releng.prereqs.sdk/pom.xml
index 078b5ad8cac..dd42683931a 100644
--- a/eclipse.platform.releng.prereqs.sdk/pom.xml
+++ b/eclipse.platform.releng.prereqs.sdk/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product
index 661bf1b94bb..9ddc15701bf 100755
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="eclipse-junit-tests" uid="eclipse-junit-tests" version="4.36.0.qualifier" type="mixed" includeLaunchers="false" autoIncludeRequirements="false">
+<product name="eclipse-junit-tests" uid="eclipse-junit-tests" version="4.37.0.qualifier" type="mixed" includeLaunchers="false" autoIncludeRequirements="false">
 
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
index bdf55815f13..574b9e2d8f1 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>eclipse.platform.releng.tychoeclipsebuilder</groupId>
     <artifactId>eclipse.platform.releng.tychoeclipsebuilder</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>eclipse-junit-tests</artifactId>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
index c40e859f457..877ecd60377 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties
@@ -5,10 +5,10 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.dmg
 
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.35-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.35-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.35-macosx-cocoa-x86_64.dmg
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.36RC2-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.36RC2-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.36RC2-macosx-cocoa-x86_64.dmg
 
 org.eclipse.equinox.p2.tests.current.build.repo=https://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}
-org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/R-4.35-202502280140/
+org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/S-4.36RC2-202505281830/
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
index a67c3c22149..99212981489 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties
@@ -5,4 +5,4 @@ buildId=${buildId}
 # such as "4.5" instead of "4.5.0".
 eclipseStream=${releaseNumberSDK}
 # similar for previous release version
-previousReleaseVersion=4.35
\ No newline at end of file
+previousReleaseVersion=4.36RC2
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf
index feb5a308f0b..e32098afd73 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.p2.inf
@@ -9,7 +9,7 @@ update.description = An update for 4.x generation Eclipse Platform.
 
 # Set the product property type
 properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = 4.36 Release of the Eclipse Platform.
+properties.1.value = 4.37 Release of the Eclipse Platform.
 
 properties.2.name = org.eclipse.equinox.p2.provider
 properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
index eae74164b28..54fc53b23ca 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/platform.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.36.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse Platform" uid="org.eclipse.platform.ide" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.37.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
index c55d30ff1f9..23375910b9f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>eclipse.platform.releng.tychoeclipsebuilder</groupId>
     <artifactId>eclipse.platform.releng.tychoeclipsebuilder</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
   <groupId>eclipse.platform.repository</groupId>
   <artifactId>eclipse.platform.repository</artifactId>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf
index 6c5119d6f7b..59929d27908 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.p2.inf
@@ -9,7 +9,7 @@ update.description = An update for 4.x generation Eclipse SDK.
 
 # Set the product property type
 properties.1.name = org.eclipse.equinox.p2.description
-properties.1.value = 4.36 Release of the Eclipse SDK.
+properties.1.value = 4.37 Release of the Eclipse SDK.
 
 properties.2.name = org.eclipse.equinox.p2.provider
 properties.2.value = Eclipse.org
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
index e8bcd74fff6..c766ff0218f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/sdk.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.36.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Eclipse SDK" uid="org.eclipse.sdk.ide" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="4.37.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
index 6232ec94921..72922d6fb2f 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/equinox-sdk.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product uid="org.eclipse.equinox.sdk.product" version="4.36.0.qualifier" useFeatures="true" includeLaunchers="false">
+<product uid="org.eclipse.equinox.sdk.product" version="4.37.0.qualifier" useFeatures="true" includeLaunchers="false">
 
    <license>
         <url>http://eclipse.org/legal/epl/notice.php</url>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml
index db505200720..389b81a19bf 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>eclipse.platform.releng.tychoeclipsebuilder</groupId>
     <artifactId>eclipse.platform.releng.tychoeclipsebuilder</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>equinox-sdk</artifactId>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
index c29e7a9c71a..99110837463 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="4.36.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="4.37.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index dc030560cfa..143f7efe97a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>eclipse.platform.releng.tychoeclipsebuilder</groupId>
     <artifactId>eclipse.platform.releng.tychoeclipsebuilder</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rt.osgistarterkit.product</artifactId>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
index 5b45d206b3c..8915915db99 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>
 
diff --git a/eclipse.platform.releng/bundles/org.eclipse.rcp/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.rcp/META-INF/MANIFEST.MF
index ec51de7d314..18f536030e6 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.rcp/META-INF/MANIFEST.MF
+++ b/eclipse.platform.releng/bundles/org.eclipse.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rcp; singleton:=true
-Bundle-Version: 4.36.0.qualifier
+Bundle-Version: 4.37.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/META-INF/MANIFEST.MF
index 620fedbcc18..b3176df5c44 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/META-INF/MANIFEST.MF
+++ b/eclipse.platform.releng/bundles/org.eclipse.sdk.examples/META-INF/MANIFEST.MF
@@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.sdk.examples; singleton:=true
-Bundle-Version: 4.36.0.qualifier
+Bundle-Version: 4.37.0.qualifier
 Bundle-Localization: plugin
diff --git a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/META-INF/MANIFEST.MF
index 0cd72c1c836..61468780089 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/META-INF/MANIFEST.MF
+++ b/eclipse.platform.releng/bundles/org.eclipse.sdk.tests/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests
 Bundle-SymbolicName: org.eclipse.sdk.tests; singleton:=true
-Bundle-Version: 4.36.0.qualifier
+Bundle-Version: 4.37.0.qualifier
 Eclipse-BundleShape: dir
 
diff --git a/eclipse.platform.releng/bundles/org.eclipse.test.performance.win32/pom.xml b/eclipse.platform.releng/bundles/org.eclipse.test.performance.win32/pom.xml
index d050913c234..50599b5d689 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.test.performance.win32/pom.xml
+++ b/eclipse.platform.releng/bundles/org.eclipse.test.performance.win32/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>eclipse.platform.releng</groupId>
     <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.platform</groupId>
diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
index d93dc81dfad..19fc8b752e3 100644
--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.platform"
       label="%featureName"
-      version="4.36.0.qualifier"
+      version="4.37.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
index 416579a698a..0a8104fbfc9 100644
--- a/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
+++ b/eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>eclipse.platform.releng</groupId>
     <artifactId>eclipse.platform.releng</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <groupId>org.eclipse.platform.feature</groupId>
diff --git a/eclipse.platform.releng/features/org.eclipse.rcp/feature.xml b/eclipse.platform.releng/features/org.eclipse.rcp/feature.xml
index af417ae4b6c..b8b2835ecc0 100644
--- a/eclipse.platform.releng/features/org.eclipse.rcp/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.rcp/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rcp"
       label="%featureName"
-      version="4.36.0.qualifier"
+      version="4.37.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.rcp"
       license-feature="org.eclipse.license"
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml
index 21a3d019ab3..c7dc724e673 100644
--- a/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.sdk.examples-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.sdk.examples"
       label="%featureName"
-      version="4.36.0.qualifier"
+      version="4.37.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
index 7dfa0d72ee4..4277ca008bb 100644
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.sdk.tests"
       label="%featureName"
-      version="4.36.0.qualifier"
+      version="4.37.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml
index 80ac906bc1e..5d816816415 100644
--- a/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.sdk/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.sdk"
       label="%featureName"
-      version="4.36.0.qualifier"
+      version="4.37.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/eclipse.platform.releng/pom.xml b/eclipse.platform.releng/pom.xml
index ab85d6b1679..77689c00d30 100644
--- a/eclipse.platform.releng/pom.xml
+++ b/eclipse.platform.releng/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.36.0-SNAPSHOT</version>
+    <version>4.37.0-SNAPSHOT</version>
     <relativePath>../eclipse-platform-parent</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 8df62dc6ce4..ec22ad95dd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 
   <groupId>org.eclipse.platform</groupId>
   <artifactId>platform-aggregator</artifactId>
-  <version>4.36.0-SNAPSHOT</version>
+  <version>4.37.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <pluginRepositories>
diff --git a/production/testScripts/configuration/streamSpecific.properties b/production/testScripts/configuration/streamSpecific.properties
index 247c94f08ef..d3255a6e44f 100644
--- a/production/testScripts/configuration/streamSpecific.properties
+++ b/production/testScripts/configuration/streamSpecific.properties
@@ -5,22 +5,22 @@
 
 # purely title or identifier for display, to help confirm right file
 # is being retrieved and used.
-streamSpecificPropertiesTitle="Properties for 4.36.0 builds and tests"
+streamSpecificPropertiesTitle="Properties for 4.37.0 builds and tests"
 
 # These "previousRelease" variables are primarily used to have a
 # stable version of Eclipse, that is used, for example, for it's p2
 # director, etc., so that "running the tests" is not actually using
 # the "just built" versions.
-previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.35-202502280140/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.36RC2-202505281830/
 # version here is "build label" ... in general form, the "middle" of archive name,
 # such as  "eclipse-platform-${previousReleaseVersion}-linux-gtk-x86_64.tar.gz
 # Also used used in p2 testing?
-previousReleaseVersion=4.35
+previousReleaseVersion=4.36RC2
 # This is last segment of last release repo, such as in
 #  http://${ARCHIVE_HOST}/eclipse/updates/${previousReleaseVersion}
 # NOTE: I am assuming the "composite" repo is suitable for p2. In theory,
 # they might want the simple repo, such as at 4.4/R-4.4.1-201409250400
-previousReleaseVersionRepo=4.35
+previousReleaseVersionRepo=4.36-I-builds
 
 # Note: API tests needs the _base_ of previous release, and also the previous service release
 # Bug 378587 - update releng tests (data) to go work against previous release
diff --git a/scripts/updateProductVersion.sh b/scripts/updateProductVersion.sh
index a75d5fd01b2..ac2c92c38c8 100755
--- a/scripts/updateProductVersion.sh
+++ b/scripts/updateProductVersion.sh
@@ -15,7 +15,7 @@
 
 script_location=$( (cd $(dirname $0) && pwd) )
 
-find $script_location/.. -name pom.xml -exec sed -i 's/4.35.0/4.346.0/g' {} \;
-find $script_location/.. -name MANIFEST.MF -exec sed -i 's/4.35.0/4.36.0/g' {} \;
-find $script_location/.. -type f -name *.product -exec sed -i 's/4.35.0/4.36.0/g' {} \;
-find $script_location/.. -name feature.xml -exec sed -i 's/4.35.0/4.36.0/g' {} \;
\ No newline at end of file
+find $script_location/.. -name pom.xml -exec sed -i 'g|s/4.36.0/4.37.0/g' {} \;
+find $script_location/.. -name MANIFEST.MF -exec sed -i 'g|s/4.36.0/4.37.0/g' {} \;
+find $script_location/.. -type f -name *.product -exec sed -i 'g|s/4.36.0/4.37.0/g' {} \;
+find $script_location/.. -name feature.xml -exec sed -i 'g|s/4.36.0/4.37.0/g' {} \;
\ No newline at end of file