diff --git a/JenkinsJobs/Releng/FOLDER.groovy b/JenkinsJobs/Releng/FOLDER.groovy
index a4c419384cb..c561214a10f 100644
--- a/JenkinsJobs/Releng/FOLDER.groovy
+++ b/JenkinsJobs/Releng/FOLDER.groovy
@@ -95,29 +95,23 @@ pipelineJob('Releng/prepareNextDevCycle'){
 	}
 }
 
-pipelineJob('Releng/renameAndPromote'){
-	displayName('Rename and Promote')
+pipelineJob('Releng/promoteBuild'){
+	displayName('Promote Build')
 	description('''\
 This job does the "stage 1" or first part of a promotion.
-It renames the files for Equinox and Eclipse, creates an appropriate repo on 'downloads', rsync's everything to 'downloads', but leave everything "invisible" -- unless someone knows the exact URL.
+It renames the files for Equinox and Eclipse, creates an appropriate repo on 'downloads', sync's everything to 'downloads', but leave everything "invisible" -- unless someone knows the exact URL.
 This allows two things. First, allows artifacts some time to "mirror" when that is needed.
 But also, allows the sites and repositories to be examined for correctness before making them visible to the world.
 The second (deferred) step that makes things visible works, in part, based on some output of this first step. Hence, they must "share a workspace".
 ''')
 	parameters {
 		stringParam('DROP_ID', null, '''\
-The name (or, build id) of the build to rename and promote. Typically would be a value such as I20160530-2000 or M20160912-1000.
+The name (or, build id) of the build to promote. Typically would be a value such as 'I20250714-1800'.
 It must match the name of the build on the build machine.
 		''')
 		stringParam('CHECKPOINT', null, 'M1, M3, RC1, RC2, RC3 etc (blank for final releases).')
 		stringParam('SIGNOFF_BUG', null, 'The issue that was used to "signoff" the checkpoint. If there are no unit test failures, this can be left blank. Otherwise a link is added to test page explaining that "failing unit tests have been investigated".')
 		stringParam('TRAIN_NAME', null, 'The name of the release stream, typically yyyy-mm. For example: 2022-09')
-		stringParam('STREAM', null, 'Needs to be all three files of primary version for the release, such as 4.7.1 or 4.8.0.')
-		stringParam('DL_TYPE', null, "This is the build type we are promoting TO. I-builds promote to 'S' until 'R'.")
-		stringParam('TAG', null, ''' For passing to the tagEclipseRelease job.
-R is used for release builds. For example: R4_25
-S is used for milestones and includes the milestone version. For example: S4_25_0_RC2
-''')
 	}
 	definition {
 		cpsScm {
@@ -125,7 +119,7 @@ S is used for milestones and includes the milestone version. For example: S4_25_
 			scm {
 				github('eclipse-platform/eclipse.platform.releng.aggregator', 'master')
 			}
-			scriptPath('JenkinsJobs/Releng/renameAndPromote.jenkinsfile')
+			scriptPath('JenkinsJobs/Releng/promoteBuild.jenkinsfile')
 		}
 	}
 }
@@ -155,11 +149,11 @@ GitHub issue to track tagging the release, for example:
 	}
 }
 
-pipelineJob('Releng/makeVisible'){
-	displayName('Make Visible')
+pipelineJob('Releng/publishPromotedBuild'){
+	displayName('Publish Promoted Build')
 	description('''\
-Make a 'release build', which was previously declared by running the 'Rename And Promote' job, visible.
-The first part of a promotion -- the 'Rename And Promote' job -- puts the build at its final location, but keeps it hidden.
+Make a 'release build', which was previously declared by running the 'Promote Build' job, visible.
+The first part of a promotion -- the 'Promote Build' job -- puts the build at its final location, but keeps it hidden.
 Therefore, both jobs have to share a 'workspace', and the output of the first job must remain in place until its time to "make visible".
 ''')
 	parameters {
@@ -175,7 +169,7 @@ It must match the name of the build on the download server.
 			scm {
 				github('eclipse-platform/eclipse.platform.releng.aggregator', 'master')
 			}
-			scriptPath('JenkinsJobs/Releng/makeVisible.jenkinsfile')
+			scriptPath('JenkinsJobs/Releng/publishPromotedBuild.jenkinsfile')
 		}
 	}
 }
diff --git a/JenkinsJobs/Releng/promoteBuild.jenkinsfile b/JenkinsJobs/Releng/promoteBuild.jenkinsfile
new file mode 100644
index 00000000000..49468c450f6
--- /dev/null
+++ b/JenkinsJobs/Releng/promoteBuild.jenkinsfile
@@ -0,0 +1,163 @@
+pipeline {
+	options {
+		skipDefaultCheckout()
+		timestamps()
+		timeout(time: 120, unit: 'MINUTES')
+		buildDiscarder(logRotator(numToKeepStr:'5'))
+	}
+	agent {
+		label 'basic'
+	}
+	environment {
+		HIDE_SITE = 'true'
+		// Download Server locations (would very seldom change)
+		BUILD_ROOT = '/home/data/httpd/download.eclipse.org'
+		EP_ECLIPSE_ROOT = "${BUILD_ROOT}/eclipse"
+		EP_EQUINOX_ROOT = "${BUILD_ROOT}/equinox"
+	}
+	stages {
+		stage('Process input') {
+			steps {
+				script {
+					env.DROP_ID = readParameter('DROP_ID')
+					if (!"${DROP_ID}") {
+						error("Parameter 'DROP_ID' is not specified")
+					}
+					env.CHECKPOINT = readParameter('CHECKPOINT')
+					env.SIGNOFF_BUG = readParameter('SIGNOFF_BUG')
+					env.TRAIN_NAME = readParameter('TRAIN_NAME')
+					if (!"${TRAIN_NAME}") {
+						error("Parameter 'TRAIN_NAME' is not specified")
+					}
+					def idMatcher = null
+					if ((idMatcher = env.DROP_ID =~ /(?<type>I)(?<date>\d{8})-(?<time>\d{4})/).matches()) {
+						assignEnvVariable('BUILD_LABEL', "${DROP_ID}")
+					} else if ((idMatcher = env.DROP_ID =~ /(?<type>S)-(?<major>\d+)\.(?<minor>\d+)(?<service>\.\d+)?((M|RC)\d+[a-z]?)?-(?<date>\d{8})(?<time>\d{4})/).matches()) {
+						assignEnvVariable('BUILD_LABEL', idMatcher.group('major') + '.' + idMatcher.group('minor') + (idMatcher.group('service') ?: ''))
+						if ("${CHECKPOINT}") {
+							error "Stable build DROP_ID=${DROP_ID} may only be promoted to release CHECKPOINT, which therefore must be empty: ${CHECKPOINT}"
+						}
+					} else {
+						error "DROP_ID, ${DROP_ID}, did not match any expected pattern."
+					}
+					assignEnvVariable('BUILD_TYPE', idMatcher.group('type'))
+					assignEnvVariable('REPO_BUILD_TYPE', 'I')
+					assignEnvVariable('BUILD_TIMESTAMP', idMatcher.group('date') + idMatcher.group('time'))
+					assignEnvVariable('REPO_ID', "I${idMatcher.group('date')}-${idMatcher.group('time')}")
+					idMatcher = null // release matcher as it's not serializable
+					
+					assignEnvVariable('BUILD_LABEL_EQ', "${BUILD_LABEL}")
+					assignEnvVariable('DROP_ID_EQ', "${DROP_ID}")
+					
+					sh 'curl -o buildproperties.shsource --fail https://download.eclipse.org/eclipse/downloads/drops4/${DROP_ID}/buildproperties.shsource'
+					def STREAM = sh(returnStdout: true, script: 'source ./buildproperties.shsource && echo ${STREAM}').trim()
+					def versionMatcher = STREAM =~ /(?<major>\d+)\.(?<minor>\d+).(?<service>\d+)/
+					if (!versionMatcher.matches()) {
+						error "STREAM must contain major, minor, and service versions, such as '4.37.0', but found: ${STREAM}"
+					}
+					assignEnvVariable('BUILD_MAJOR', versionMatcher.group('major'))
+					assignEnvVariable('BUILD_MINOR', versionMatcher.group('minor'))
+					assignEnvVariable('BUILD_SERVICE', versionMatcher.group('service'))
+					versionMatcher = null // release matcher as it's not serializable
+					
+					if ("${CHECKPOINT}" ==~ /M\d+([a-z])?/ || "${CHECKPOINT}" ==~ /RC\d+([a-z])?/) { // milestone or RC promotion
+						assignEnvVariable('DL_TYPE', 'S')
+						// REPO_SITE_SEGMENT variale not used in this case
+					} else if(!"${CHECKPOINT}") { // release promotion
+						assignEnvVariable('DL_TYPE', 'R')
+						assignEnvVariable('REPO_SITE_SEGMENT', "${BUILD_MAJOR}.${BUILD_MINOR}")
+					} else {
+						error "CHECKPOINT, ${CHECKPOINT}, did not match any expected pattern."
+					}
+					assignEnvVariable('NEWS_ID', "${BUILD_MAJOR}.${BUILD_MINOR}")
+					
+					assignEnvVariable('DL_LABEL', "${BUILD_SERVICE}" == '0' // For initial releases, do not include service in label
+						? "${BUILD_MAJOR}.${BUILD_MINOR}${CHECKPOINT}"
+						: "${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_SERVICE}${CHECKPOINT}"
+					)
+					assignEnvVariable('DL_LABEL_EQ', "${DL_LABEL}")
+					
+					// This is DL_DROP_ID for Eclipse. The one for equinox has DL_LABEL_EQ in middle.
+					assignEnvVariable('DL_DROP_ID', "${DL_TYPE}-${DL_LABEL}-${BUILD_TIMESTAMP}")
+					assignEnvVariable('DL_DROP_ID_EQ', "${DL_TYPE}-${DL_LABEL_EQ}-${BUILD_TIMESTAMP}")
+					
+					if (!env.SIGNOFF_BUG) {
+						echo '''\
+							[WARNING] SIGNOFF_BUG was not defined. That is valid if no Unit Tests failures but otherwise should be defined.
+							Can be added by hand to buildproperties.php in drop site, if in fact there were errors, and simply forgot to specify.
+						'''.stripIndent()
+					}
+					
+					def serviceVersionSegment = (env.CHECKPOINT || env.BUILD_SERVICE != '0') ? ('_' + env.BUILD_SERVICE) : ''
+					assignEnvVariable('TAG', "${DL_TYPE}${BUILD_MAJOR}_${BUILD_MINOR}${serviceVersionSegment}${env.CHECKPOINT ? ('_' + env.CHECKPOINT) : ''}")
+				}
+			}
+		}
+		stage('Rename and Promote') {
+			environment {
+				BUILDMACHINE_BASE_DL = "${EP_ECLIPSE_ROOT}/downloads/drops4"
+				BUILDMACHINE_BASE_EQ = "${EP_EQUINOX_ROOT}/drops"
+				BUILD_REPO_ORIGINAL = "${BUILD_MAJOR}.${BUILD_MINOR}-${REPO_BUILD_TYPE}-builds"
+				BUILDMACHINE_BASE_SITE = "${EP_ECLIPSE_ROOT}/updates/${BUILD_REPO_ORIGINAL}"
+				// Eclipse and Equinox drop Site (final segment)
+				ECLIPSE_DL_DROP_DIR_SEGMENT = "${DL_TYPE}-${DL_LABEL}-${BUILD_TIMESTAMP}"
+				EQUINOX_DL_DROP_DIR_SEGMENT = "${DL_TYPE}-${DL_LABEL_EQ}-${BUILD_TIMESTAMP}"
+			}
+			steps {
+				writeFile(file: "${WORKSPACE}/stage2output${TRAIN_NAME}${CHECKPOINT}/mailtemplate.txt", text: """\
+					We are pleased to announce that ${TRAIN_NAME} ${CHECKPOINT} is available for download and updates.
+					
+						Eclipse downloads:
+						https://download.eclipse.org/eclipse/downloads/drops4/${ECLIPSE_DL_DROP_DIR_SEGMENT}/
+						
+						New and Noteworthy:
+						https://www.eclipse.org/eclipse/news/${NEWS_ID}/
+						
+						Update existing (non-production) installs:
+						https://download.eclipse.org/eclipse/updates/${DL_TYPE == 'R' ? REPO_SITE_SEGMENT : BUILD_REPO_ORIGINAL}/
+						
+						Specific repository good for building against:
+						https://download.eclipse.org/eclipse/updates/${DL_TYPE == 'R' ? (REPO_SITE_SEGMENT + '/' + ECLIPSE_DL_DROP_DIR_SEGMENT) : (BUILD_REPO_ORIGINAL + '/' + DROP_ID)}/
+						
+						Equinox specific downloads:
+						https://download.eclipse.org/equinox/drops/${EQUINOX_DL_DROP_DIR_SEGMENT}/
+					
+					Thank you to everyone who made this checkpoint possible.
+				""".stripIndent())
+				sshagent(['projects-storage.eclipse.org-bot-ssh']) {
+					sh '''#!/bin/bash -x
+						curl -o promoteSites.sh https://download.eclipse.org/eclipse/relengScripts/cje-production/promotion/promoteSites.sh
+						chmod +x promoteSites.sh
+						./promoteSites.sh
+					'''
+				}
+				build job: 'Releng/tagEclipseRelease', wait: true, propagate: true, parameters: [
+					string(name: 'tag', value: "${TAG}"),
+					string(name: 'buildID', value: "${DROP_ID}"),
+					string(name: 'annotation', value: "${ params.SIGNOFF_BUG ? 'https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/' + params.SIGNOFF_BUG : '' }")
+				]
+			}
+		}
+	}
+	post {
+		always {
+			archiveArtifacts '**/stage2output*/**'
+		}
+	}
+}
+
+@NonCPS
+def assignEnvVariable(String name, String value) {
+	env."${name}" = value
+	println("${name}=${value}")
+}
+
+@NonCPS
+def readParameter(String name) {
+	//TODO: let jenkins trim the parameters
+	def value = (params[name] ?: '').trim()
+	if (value) {
+		println("${name}: ${value}")
+	}
+	return value
+}
diff --git a/JenkinsJobs/Releng/makeVisible.jenkinsfile b/JenkinsJobs/Releng/publishPromotedBuild.jenkinsfile
similarity index 66%
rename from JenkinsJobs/Releng/makeVisible.jenkinsfile
rename to JenkinsJobs/Releng/publishPromotedBuild.jenkinsfile
index 4618fcd0be8..84f6879eed7 100644
--- a/JenkinsJobs/Releng/makeVisible.jenkinsfile
+++ b/JenkinsJobs/Releng/publishPromotedBuild.jenkinsfile
@@ -15,10 +15,10 @@ pipeline {
 					if (!params.releaseBuildID) {
 						error "Required parameter 'releaseBuildID' is not defined."
 					}
-					env.RELEASE_ID = params.releaseBuildID.trim()
-					def releaseIDMatcher = RELEASE_ID =~ /(?<type>[SR])-(?<major>\d+)\.(?<minor>\d+)(.\d+)?((M|RC)\d+[a-z]?)?-\d{12}/
+					env.RELEASE_BUILD_ID = params.releaseBuildID.trim()
+					def releaseIDMatcher = env.RELEASE_BUILD_ID =~ /(?<type>[SR])-(?<major>\d+)\.(?<minor>\d+)(\.\d+)?((M|RC)\d+[a-z]?)?-\d{12}/
 					if (!releaseIDMatcher.matches()) {
-						error "releaseID: ${RELEASE_ID}, does not match the expected pattern."
+						error "releaseID: ${RELEASE_BUILD_ID}, does not match the expected pattern."
 					}
 					env.RELEASE_TYPE = releaseIDMatcher.group('type')
 					env.RELEASE_VERSION_MAJOR = releaseIDMatcher.group('major')
@@ -27,31 +27,31 @@ pipeline {
 				}
 				sh '''
 					echo 'Input parameters read successfully'
-					echo "RELEASE_ID='$RELEASE_ID'"
+					echo "RELEASE_BUILD_ID='$RELEASE_BUILD_ID'"
 					echo "RELEASE_TYPE='$RELEASE_TYPE'"
 					echo "RELEASE_VERSION_MAJOR='$RELEASE_VERSION_MAJOR'"
 					echo "RELEASE_VERSION_MINOR='$RELEASE_VERSION_MINOR'"
 				'''
 			}
 		}
-		stage('Make Download page visible') {
+		stage('Make Download Page visible') {
 			steps {
 				sshagent(['projects-storage.eclipse.org-bot-ssh']) {
 					sh '''#!/bin/bash -xe
 						# Build machine locations (would very seldom change)
 						DOWNLOAD_ROOT=${DOWNLOAD_ROOT:-/home/data/httpd/download.eclipse.org}
 						ARCHIVE_ROOT=${ARCHIVE_ROOT:-/home/data/httpd/archive.eclipse.org} 
-						ECLIPSE_MARKER="eclipse/downloads/drops4/${RELEASE_ID}/buildHidden"
-						EQUINOX_MARKER="equinox/drops/${RELEASE_ID}/buildHidden"
-						SSH_PREFIX="ssh genie.releng@projects-storage.eclipse.org"
-						
-						${SSH_PREFIX} rm --force "${DOWNLOAD_ROOT}/${ECLIPSE_MARKER}"
-						${SSH_PREFIX} rm --force "${DOWNLOAD_ROOT}/${EQUINOX_MARKER}"
-						
+						ROOT_LOCATIONS=("${DOWNLOAD_ROOT}")
 						if [[ "${RELEASE_TYPE}" == 'R' ]]; then
-							${SSH_PREFIX} rm --force "${ARCHIVE_ROOT}/${ECLIPSE_MARKER}"
-							${SSH_PREFIX} rm --force "${ARCHIVE_ROOT}/${EQUINOX_MARKER}"
+							ROOT_LOCATIONS+=("${ARCHIVE_ROOT}")
 						fi
+						MARKER_FILES=("eclipse/downloads/drops4/${RELEASE_BUILD_ID}/buildHidden" "equinox/drops/${RELEASE_BUILD_ID}/buildHidden")
+						
+						for rootLocation in "${ROOT_LOCATIONS[@]}"; do
+							for markerFile in "${MARKER_FILES[@]}"; do
+								ssh genie.releng@projects-storage.eclipse.org rm --force "${rootLocation}/${markerFile}"
+							done
+						done
 					'''
 				}
 				build job: 'Releng/updateIndex', wait: false
@@ -64,7 +64,7 @@ pipeline {
 			steps {
 				build job: 'Releng/modifyP2CompositeRepository', wait: true, propagate: true, parameters: [
 					string(name: 'repositoryPath', value: "eclipse/updates/${RELEASE_VERSION_MAJOR}.${RELEASE_VERSION_MINOR}"),
-					string(name: 'add', value: "${RELEASE_ID}")
+					string(name: 'add', value: "${RELEASE_BUILD_ID}")
 				]
 			}
 		}
diff --git a/JenkinsJobs/Releng/renameAndPromote.jenkinsfile b/JenkinsJobs/Releng/renameAndPromote.jenkinsfile
deleted file mode 100644
index 3e87983f03e..00000000000
--- a/JenkinsJobs/Releng/renameAndPromote.jenkinsfile
+++ /dev/null
@@ -1,34 +0,0 @@
-pipeline {
-	options {
-		skipDefaultCheckout()
-		timestamps()
-		timeout(time: 120, unit: 'MINUTES')
-		buildDiscarder(logRotator(numToKeepStr:'5'))
-	}
-	agent {
-		label 'basic'
-	}
-	stages {
-		stage('Rename and Promote') {
-			steps {
-				sshagent(['projects-storage.eclipse.org-bot-ssh']) {
-					sh '''#!/bin/bash -x
-						curl -o promoteSites.sh https://download.eclipse.org/eclipse/relengScripts/cje-production/promotion/promoteSites.sh
-						chmod +x promoteSites.sh
-						./promoteSites.sh
-					'''
-				}
-				build job: 'Releng/tagEclipseRelease', wait: true, propagate: true, parameters: [
-					string(name: 'tag', value: "${TAG}"),
-					string(name: 'buildID', value: "${DROP_ID}"),
-					string(name: 'annotation', value: "${ params.SIGNOFF_BUG ? 'https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/' + params.SIGNOFF_BUG : '' }")
-				]
-			}
-		}
-	}
-	post {
-		always {
-			archiveArtifacts '**/stage2output*/**'
-		}
-	}
-}
diff --git a/RELEASE.md b/RELEASE.md
index bb5749eb456..dbbbde23fff 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -21,7 +21,7 @@
      * All milestone releases are 'lightweight', meaning there is no announcement or signoff.
      No additional builds need to be run, just the daily I-build at 6PM EST.
      Thursdays build is promoted to simrel on friday (unless there are problems with Thursdays build, in which case promote Wednesdays) and the compiler is updated if necessary,
-     but the `Promote` and `Make Visible` jobs don't need to be run.
+     but the `Promote Build` and `Publish Promoted Build` jobs don't need to be run.
    - **Wednesday**:
      * Verify that EMF, ECF and Orbit contributions have been included (if applicable).
      * Final release candidate build runs at 6PM EST.
@@ -35,15 +35,12 @@
        * Just [1 line](https://www.eclipse.org/lists/platform-releng-dev/msg38086.html) asking for sign off on the GitHub issue created in the previous step.
    - **Friday**:
      * **Promote** the release candidate (if go).
-       * Run the [Rename and Promote](https://ci.eclipse.org/releng/job/Releng/job/renameAndPromote/) job in Jenkins
+       * Run the [Promote Build](https://ci.eclipse.org/releng/job/Releng/job/promoteBuild/) job in Jenkins
          - DROP_ID: Release candidate build ID (make sure there is no space before or after the ID).
          - CHECKPOINT: M1 etc (blank for final releases)
          - SIGNOFF_BUG: Needs to be updated to sign-off issue (numeric part only)
          - TRAIN_NAME: Whenever the current GA release is planned for (formatted 4 digit year - 2 digit month, i.e `2022-06`)
-         - STREAM: 4.24.0 etc
-         - DL_TYPE: S is used to promote I-builds.
-         - TAG: Parameter should match stream version, i.e `S4_30_0_RC1` etc
-         - After the build  find and open the mail template [artifact](https://ci.eclipse.org/releng/job/Releng/job/renameAndPromote/lastSuccessfulBuild/artifact/) and have it ready.
+         - After the build  find and open the mail template [artifact](https://ci.eclipse.org/releng/job/Releng/job/promoteBuild/lastSuccessfulBuild/artifact/) and have it ready.
          - This should automatically run [tag Eclipse release](https://ci.eclipse.org/releng/job/Releng/job/tagEclipseRelease/) to tag the source code.
        * Contribute to SimRel
          - If you have not already set up SimRel you can do so using Auto Launch [here](https://www.eclipse.org/setups/installer/?url=https://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/interim/SimultaneousReleaseTrainConfiguration.setup&show=true)
@@ -54,10 +51,10 @@
            4. Update the Location property to the "Specific repository for building against" in the mailtemplate.txt from promotion.
            5. Commit Simrel updates to Gerrit
               - Message should use year-month format, i.e "Simrel updates for Eclipse and Equinox for 2022-06 M1"
-       * Run the [Make Visible](https://ci.eclipse.org/releng/job/Releng/job/makeVisible/) job in Releng jenkins to make the promoted build visible on the download page.
-         - `releaseBuildID`: the full id of the milestone, release-candidate or release build to make visible, e.g. `S-4.26M1-202209281800` or `R-4.36-202505281830`
+       * Run the [Publish Promoted Build](https://ci.eclipse.org/releng/job/Releng/job/publishPromotedBuild/) job in Releng jenkins to make the promoted build visible on the download page.
+         - `releaseBuildID`: the full id of the milestone, release-candidate or release build to publish, e.g. `S-4.26M1-202209281800` or `R-4.36-202505281830`
        * Send email that the M1 build is available
-         - Use the mail template from the promotion build [artifacts](https://ci.eclipse.org/releng/job/Releng/job/renameAndPromote/lastSuccessfulBuild/artifact/) in Jenkins to get the download urls.
+         - Use the mail template from the promotion build [artifacts](https://ci.eclipse.org/releng/job/Releng/job/promoteBuild/lastSuccessfulBuild/artifact/) in Jenkins to get the download urls.
          - Make sure to mention that the Master branch is now again open for development.
        * For **Milestone builds** return the I-builds to the normal schedule.
      * **After RC1**
@@ -104,7 +101,7 @@ The actual steps to release
 
 **Friday**
   * #### **Promote to GA**
-    - After Simrel declares RC2 (usually the Friday before release) run the [Rename and Promote](https://ci.eclipse.org/releng/job/Releng/job/renameAndPromote/) job to promote RC2 (or RC2a). If the [daily cleanup for old builds](https://ci.eclipse.org/releng/job/Cleanup/job/dailyCleanOldBuilds/) job was not disabled and the original I-build is no longer available you can use the promoted RC2 build.
+    - After Simrel declares RC2 (usually the Friday before release) run the [Promote Build](https://ci.eclipse.org/releng/job/Releng/job/promoteBuild/) job to promote RC2 (or RC2a). If the [daily cleanup for old builds](https://ci.eclipse.org/releng/job/Cleanup/job/dailyCleanOldBuilds/) job was not disabled and the original I-build is no longer available you can use the promoted RC2 build.
       - Change the DL_TYPE from S to R.  
       - TAG will be set to R as well, for example `R4_27` 
     - You can subscribe to [cross-project-issues](https://accounts.eclipse.org/mailing-list/cross-project-issues-dev) to get the notifications on Simrel releases.
diff --git a/cje-production/promotion/promoteSites.sh b/cje-production/promotion/promoteSites.sh
index dd63ef5e1a7..ab0a1a349e5 100755
--- a/cje-production/promotion/promoteSites.sh
+++ b/cje-production/promotion/promoteSites.sh
@@ -235,269 +235,11 @@ function addRepoProperties ()
   ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data ${devworkspace} -application ${APP_NAME} -vmargs ${MIRRORS_URL_ARG} -Dp2ArtifactRepositoryName="${ART_REPO_NAME}" -Dp2MetadataRepositoryName="${CON_REPO_NAME}" ${ART_REPO_ARG} ${CON_REPO_ARG}
 }
 
-DROP_ID=$(echo $DROP_ID|tr -d ' ')
-
-if [[ -z "${DROP_ID}" ]]
-then
-  echo -e "\n\t[ERROR] DROP_ID must be defined for ${0##*/}"
-  exit 1
-else
-  export DROP_ID
-  echo -e "\n\t[INFO] DROP_ID: $DROP_ID"  
-fi
-
 # Extract WEBTOOLS_REPO and other variables from buildproperties.shsource for the build
-wget -O ${WORKSPACE}/buildproperties.shsource https://download.eclipse.org/eclipse/downloads/drops4/${DROP_ID}/buildproperties.shsource
 source ${WORKSPACE}/buildproperties.shsource
 
-# CHECKPOINT is the code for either milestone (M1, M2, ...) 
-# or release candidate (RC1, RC2, ...). 
-# It should be empty for the final release.
-CHECKPOINT=$(echo $CHECKPOINT|tr -d ' ')
-if [[ -z "${CHECKPOINT}" ]]
-then
-  echo -e "\n\t[WARNING] CHECKPOINT was blank in ${0##*/}"
-else
-  export CHECKPOINT
-  echo -e "\n\t[INFO] CHECKPOINT: $CHECKPOINT"  
-fi
-
-# This SIGNOFF_BUG should not be defined, if there are no errors in JUnit tests.
-SIGNOFF_BUG=$(echo $SIGNOFF_BUG|tr -d ' ')
-if [[ -z "${SIGNOFF_BUG}" ]]
-then
-  echo -e "\n\t[WARNING] SIGNOFF_BUG was not defined. That is valid if no Unit Tests failures but otherwise should be defined."
-  echo -e "\t\tCan be added by hand to buildproperties.php in drop site, if in fact there were errors, and simply forgot to specify."
-else
-  export SIGNOFF_BUG
-  echo -e "\t\t[INFO] SIGNOFF_BUG: $SIGNOFF_BUG"
-fi
-
-
-TRAIN_NAME=$(echo $TRAIN_NAME|tr -d ' ')
-if [[ -z "${TRAIN_NAME}" ]]
-then
-  echo -e "\n\t[ERROR] TRAIN_NAME must be defined for ${0##*/}"
-  exit 1
-else
-  export TRAIN_NAME
-  echo -e "\n\t[INFO] TRAIN_NAME: $TRAIN_NAME"  
-fi
-
-# STREAM is the three digit release number, such as 4.7.0 or 4.6.1.
-STREAM=$(echo $STREAM|tr -d ' ')
-if [[ -z "${STREAM}" ]]
-then
-  echo -e "\n\t[ERROR] STREAM must be defined for ${0##*/}"
-  exit 1
-else
-  export STREAM
-  echo -e "\n\t[INFO] STREAM: $STREAM"  
-fi
-
-# DL_TYPE ("download type") is the build type we are naming 
-# the build *TO*
-# for main line (master) code, it is always 'S' (from I-build) until it's 'R'
-#export DL_TYPE=S
-#export DL_TYPE=R
-DL_TYPE=$(echo $DL_TYPE|tr -d ' ')
-if [[ -z "${DL_TYPE}" ]]
-then
-  echo -e "\n\t[ERROR] DL_TYPE must be defined for ${0##*/}"
-  exit 1
-else
-  # Could probably define default - or validate! - based on first letter of DROP_ID
-  # M --> M
-  # I --> S
-  export DL_TYPE
-  echo -e "\n\t[INFO] DL_TYPE: $DL_TYPE"  
-fi
-
-SSH_PREFIX="ssh genie.releng@projects-storage.eclipse.org"
-export STAGE2DIRSEG=stage2output${TRAIN_NAME}${CHECKPOINT}
-export CL_SITE=${WORKSPACE}/${STAGE2DIRSEG}
-mkdir -p "${CL_SITE}"
-
 # Main promotion scripts starts here
 
-if [[ "${STREAM}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]]
-then
-  export BUILD_MAJOR=${BASH_REMATCH[1]}
-  export BUILD_MINOR=${BASH_REMATCH[2]}
-  export BUILD_SERVICE=${BASH_REMATCH[3]}
-else
-  echo "STREAM must contain major, minor, and service versions, such as 4.3.0"
-  echo "    but found ${STREAM}"
-  exit 1
-fi
-
-# regex section
-# BUILD_TYPE is the prefix of the build --
-# that is, for what we are renaming the build FROM
-PATTERN="^([MI])([[:digit:]]{8})-([[:digit:]]{4})$"
-if [[ "${DROP_ID}" =~ $PATTERN ]]
-then
-  export BUILD_TYPE=${BASH_REMATCH[1]}
-  export REPO_BUILD_TYPE=${BUILD_TYPE}
-  export BUILD_TIMESTAMP=${BASH_REMATCH[2]}${BASH_REMATCH[3]}
-  # Label and ID are the same, in this case
-  export BUILD_LABEL=$DROP_ID
-  export BUILD_LABEL_EQ=$DROP_ID
-  export DROP_ID_EQ=$DROP_ID
-  export REPO_ID=$DROP_ID
-else
-  PATTERN="^(S)-([[:digit:]]{1})\.([[:digit:]]{2})(.*)-([[:digit:]]{8})([[:digit:]]{4})$"
-  if [[ "${DROP_ID}" =~ $PATTERN ]]
-  then
-    export BUILD_TYPE=${BASH_REMATCH[1]}
-    export REPO_BUILD_TYPE=I
-    export BUILD_TIMESTAMP=${BASH_REMATCH[5]}${BASH_REMATCH[6]}
-    # Label and ID are the same, in this case
-    export BUILD_LABEL=${BASH_REMATCH[2]}.${BASH_REMATCH[3]}${BASH_REMATCH[4]}
-    export BUILD_LABEL_EQ=${BASH_REMATCH[2]}.${BASH_REMATCH[3]}${BASH_REMATCH[4]}
-    export DROP_ID_EQ=$DROP_ID
-    export REPO_ID=I${BASH_REMATCH[5]}-${BASH_REMATCH[6]}
-  else
-    echo -e "\n\tERROR: DROP_ID, ${DROP_ID}, did not match any expected pattern."
-    exit 1
-  fi
-fi
-
-# For initial releases, do not include service in label
-if [[ "${BUILD_SERVICE}" == "0" ]]
-then
-  export DL_LABEL=${BUILD_MAJOR}.${BUILD_MINOR}${CHECKPOINT}
-else
-  export DL_LABEL=${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_SERVICE}${CHECKPOINT}
-fi
-
-export DL_LABEL_EQ=${DL_LABEL}
-
-# This is DL_DROP_ID for Eclipse. The one for equinox has DL_LABEL_EQ in middle.
-export DL_DROP_ID=${DL_TYPE}-${DL_LABEL}-${BUILD_TIMESTAMP}
-export DL_DROP_ID_EQ=${DL_TYPE}-${DL_LABEL_EQ}-${BUILD_TIMESTAMP}
-
-# for I builds, stable and RCs go to in milestones
-# for M builds, even RCs also go in <version>-M-builds
-case ${DL_TYPE} in
-  "S" )
-    export REPO_SITE_SEGMENT=${BUILD_MAJOR}.${BUILD_MINOR}milestones
-    if [[ "${CHECKPOINT}" =~ ^M.*$ ]]
-    then
-      export NEWS_ID=${BUILD_MAJOR}.${BUILD_MINOR}
-    fi
-    # except for RC4. Since it it intended to be "final" we include the variables
-    # just like they were for an "R" build. (See bug 495252).
-    # to accomidate "respins", we use a regex so that adding an "a" or "b",
-    # will still match.
-    RCPATH=^RC.[abcd]?$
-    if [[ "${CHECKPOINT}" =~  $RCPATH ]]
-    then
-      export NEWS_ID=${BUILD_MAJOR}.${BUILD_MINOR}
-      export ACK_ID=${BUILD_MAJOR}.${BUILD_MINOR}
-      export README_ID=${BUILD_MAJOR}.${BUILD_MINOR}
-    fi
-    ;;
-  "R" )
-    export REPO_SITE_SEGMENT=${BUILD_MAJOR}.${BUILD_MINOR}
-    export NEWS_ID=${BUILD_MAJOR}.${BUILD_MINOR}
-    export ACK_ID=${BUILD_MAJOR}.${BUILD_MINOR}
-    export README_ID=${BUILD_MAJOR}.${BUILD_MINOR}
-    ;;
-  *)
-    echo -e "\n\tERROR: case statement for repo output did not match any pattern."
-    echo -e   "\t       Not written to handle DL_TYPE of ${DL_TYPE}\n"
-    exit 1
-esac
-
-export HIDE_SITE=true
-# Build machine locations (would very seldom change)
-export BUILD_ROOT=${BUILD_ROOT:-/home/data/httpd/download.eclipse.org}
-export BUILD_REPO_ORIGINAL=${BUILD_MAJOR}.${BUILD_MINOR}-${REPO_BUILD_TYPE}-builds
-export BUILDMACHINE_BASE_SITE=${BUILD_ROOT}/eclipse/updates/${BUILD_REPO_ORIGINAL}
-
-export BUILDMACHINE_BASE_DL=${BUILD_ROOT}/eclipse/downloads/drops4
-export BUILDMACHINE_BASE_EQ=${BUILD_ROOT}/equinox/drops
-
-# Eclipse Drop Site (final segment)
-export ECLIPSE_DL_DROP_DIR_SEGMENT=${DL_TYPE}-${DL_LABEL}-${BUILD_TIMESTAMP}
-# Equinox Drop Site (final segment)
-export EQUINOX_DL_DROP_DIR_SEGMENT=${DL_TYPE}-${DL_LABEL_EQ}-${BUILD_TIMESTAMP}
-
-export INITIAL_MAIL_LINES="We are pleased to announce that ${TRAIN_NAME} ${CHECKPOINT} is available for download and updates."
-export CLOSING_MAIL_LINES="Thank you to everyone who made this checkpoint possible."
-
-echo -e "\n\t[INFO] INITIAL_MAIL_LINES: $INITIAL_MAIL_LINES"  
-echo -e "\n\t[INFO] CLOSING_MAIL_LINES: $CLOSING_MAIL_LINES"  
-
-printf "\n\t%s\n\n" "Promoted on: $( date )" > "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s" "DROP_ID" "$DROP_ID" >> "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s" "BUILD_LABEL" "$BUILD_LABEL" >> "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s" "DROP_ID_EQ" "$DROP_ID_EQ" >> "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s" "BUILD_LABEL_EQ" "$BUILD_LABEL_EQ" >> "${CL_SITE}/checklist.txt"
-printf "\n" >> "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s" "DL_TYPE" "$DL_TYPE" >> "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s" "DL_LABEL" "$DL_LABEL" >> "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s" "DL_LABEL_EQ" "$DL_LABEL_EQ" >> "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s" "ECLIPSE_DL_DROP_DIR_SEGMENT" "$ECLIPSE_DL_DROP_DIR_SEGMENT" >> "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s" "EQUINOX_DL_DROP_DIR_SEGMENT" "$EQUINOX_DL_DROP_DIR_SEGMENT" >> "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s" "REPO_SITE_SEGMENT" "$REPO_SITE_SEGMENT" >> "${CL_SITE}/checklist.txt"
-printf "\n\t%20s%25s\n" "HIDE_SITE" "${HIDE_SITE}" >> "${CL_SITE}/checklist.txt"
-
-printf "\t%s\n" "Eclipse downloads:" >> "${CL_SITE}/checklist.txt"
-printf "\t%s\n\n" "https://download.eclipse.org/eclipse/downloads/drops4/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt"
-
-if [[ "${DL_TYPE}" == "R" ]]
-then
-  printf "\t%s\n" "Update existing (non-production) installs:" >> "${CL_SITE}/checklist.txt"
-  printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/" >> "${CL_SITE}/checklist.txt"
-
-  printf "\t%s\n" "Specific repository good for building against:" >> "${CL_SITE}/checklist.txt"
-  printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt"
-else
-  printf "\t%s\n" "Update existing (non-production) installs:" >> "${CL_SITE}/checklist.txt"
-  printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${BUILD_REPO_ORIGINAL}/" >> "${CL_SITE}/checklist.txt"
-
-  printf "\t%s\n" "Specific repository good for building against:" >> "${CL_SITE}/checklist.txt"
-  printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${BUILD_REPO_ORIGINAL}/${DROP_ID}/" >> "${CL_SITE}/checklist.txt"
-fi
-
-printf "\t%s\n" "Equinox specific downloads:" >> "${CL_SITE}/checklist.txt"
-printf "\t%s\n\n" "https://download.eclipse.org/equinox/drops/${EQUINOX_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt"
-
-# mail template
-
-# start with empty line, and '>' to be sure re-created if exists already.
-printf "\n" > "${CL_SITE}/mailtemplate.txt"
-
-printf "\n%s\n\n" "${INITIAL_MAIL_LINES}" >> "${CL_SITE}/mailtemplate.txt"
-
-printf "\t%s\n" "Eclipse downloads:" >> "${CL_SITE}/mailtemplate.txt"
-printf "\t%s\n\n" "https://download.eclipse.org/eclipse/downloads/drops4/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt"
-
-printf "\t%s\n" "New and Noteworthy:" >> "${CL_SITE}/mailtemplate.txt"
-printf "\t%s\n\n" "https://www.eclipse.org/eclipse/news/${NEWS_ID}/" >> "${CL_SITE}/mailtemplate.txt"
-
-if [[ "${DL_TYPE}" == "R" ]]
-then
-  printf "\t%s\n" "Update existing (non-production) installs:" >> "${CL_SITE}/mailtemplate.txt"
-  printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt"
-
-  printf "\t%s\n" "Specific repository good for building against:" >> "${CL_SITE}/mailtemplate.txt"
-  printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}/${ECLIPSE_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt"
-else
-  printf "\t%s\n" "Update existing (non-production) installs:" >> "${CL_SITE}/mailtemplate.txt"
-  printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${BUILD_REPO_ORIGINAL}/" >> "${CL_SITE}/mailtemplate.txt"
-
-  printf "\t%s\n" "Specific repository good for building against:" >> "${CL_SITE}/mailtemplate.txt"
-  printf "\t%s\n\n" "https://download.eclipse.org/eclipse/updates/${BUILD_REPO_ORIGINAL}/${DROP_ID}/" >> "${CL_SITE}/mailtemplate.txt"
-fi
-
-printf "\t%s\n" "Equinox specific downloads:" >> "${CL_SITE}/mailtemplate.txt"
-printf "\t%s\n\n" "https://download.eclipse.org/equinox/drops/${EQUINOX_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/mailtemplate.txt"
-
-printf "\n\n%s\n" "${CLOSING_MAIL_LINES}" >> "${CL_SITE}/mailtemplate.txt"
-
 #Take backup of current build
 LOCAL_EP_DIR=${WORKSPACE}/eclipse
 LOCAL_EQ_DIR=${WORKSPACE}/equinox
@@ -552,7 +294,7 @@ pushd ${LOCAL_EQ_DIR}
   fi
 
   printf "\n\t%s\n" "Promoting Equinox"
-  scp -r ${LOCAL_EQ_DIR}/${DL_DROP_ID_EQ} genie.releng@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/equinox/drops/
+  scp -r ${LOCAL_EQ_DIR}/${DL_DROP_ID_EQ} genie.releng@projects-storage.eclipse.org:${BUILDMACHINE_BASE_EQ}/
 
   if [[ "${DL_TYPE}" == "R" ]]
   then
@@ -572,7 +314,7 @@ pushd ${LOCAL_EP_DIR}
   fi
 
   printf "\n\t%s\n" "Promoting Platform"
-  scp -r ${LOCAL_EP_DIR}/${DL_DROP_ID} genie.releng@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/eclipse/downloads/drops4/
+  scp -r ${LOCAL_EP_DIR}/${DL_DROP_ID} genie.releng@projects-storage.eclipse.org:${BUILDMACHINE_BASE_DL}/
 
   if [[ "${DL_TYPE}" == "R" ]]
   then
@@ -590,6 +332,6 @@ then
     BUILDMACHINE_SITE=${LOCAL_REPO}/${REPO_ID}
     addRepoProperties ${BUILDMACHINE_SITE} ${REPO_SITE_SEGMENT} ${DL_DROP_ID}
     mv ${REPO_ID} ${DL_DROP_ID}
-    scp -r ${LOCAL_REPO}/${DL_DROP_ID} genie.releng@projects-storage.eclipse.org:/home/data/httpd/download.eclipse.org/eclipse/updates/${REPO_SITE_SEGMENT}
+    scp -r ${LOCAL_REPO}/${DL_DROP_ID} genie.releng@projects-storage.eclipse.org:${EP_ECLIPSE_ROOT}/updates/${REPO_SITE_SEGMENT}
   popd
 fi