diff --git a/JenkinsJobs/YBuilds/P_build.groovy b/JenkinsJobs/YBuilds/P_build.groovy
index 5ee4100ebba..7838edc2d28 100644
--- a/JenkinsJobs/YBuilds/P_build.groovy
+++ b/JenkinsJobs/YBuilds/P_build.groovy
@@ -149,21 +149,6 @@ spec:
                     \'\'\'
                   }
                 }
-            }
-		}
-	  stage('Copy build scripts for P-build'){
-          steps {
-              container('jnlp') {
-                    sh \'\'\'
-                        cd ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/P-build
-                        cp mb220_buildSdkPatch.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/gitCache/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
-                        cp mb220_buildSdkPatch.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
-                        cp mb300_gatherEclipseParts.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/gitCache/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
-                        cp mb300_gatherEclipseParts.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
-                        cp mb620_promoteUpdateSite.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/gitCache/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
-                        cp mb620_promoteUpdateSite.sh ${WORKSPACE}/eclipse.platform.releng.aggregator/eclipse.platform.releng.aggregator/cje-production/mbscripts/.
-                    \'\'\'
-                }
             }
 		}
 		stage('Aggregator maven build'){
diff --git a/RELENG.md b/RELENG.md
index 204155db3dd..f14c18e28a4 100644
--- a/RELENG.md
+++ b/RELENG.md
@@ -66,9 +66,6 @@ When the JDT team is ready they will raise an issue to create new Y and P builds
     - The modules listed in the top level pom file (`java##pathc/pom.xml) should match the modified plugins.
   * Update the Y-build (Y_build.groovy)[JenkinsJobs/YBuilds/Y_build.groovy] and (P_build.groovy)[JenkinsJobs/YBuilds/P_build.groovy].
     - Update `PATCH_OR_BRANCH_LABEL` and `BUILD_TYPE_NAME` to the name of the new java version
-  * Update the P-build (mb300_gatherEclipseParts.sh)[cje-production/P-build/mb300_gatherEclipseParts.sh].
-    - PATCH_BUILD_GENERIC in mb300_gatherEclipseParts.sh should be set to the name of the new maven profile
-      - The same variable in the normal (mb300_gatherEclipseParts)[cje-production/mbscripts/mb300_gatherEclipseParts.sh] should be updated as well.
   * Update and rename the java repository files in (cje-production/streams)[cje-production/streams]
     - Repos without a BETA_JAVA## branch should be set to master
   * Update (eclipse-platform-parent/pom.xml)[eclipse-platform-parent/pom.xml]
diff --git a/cje-production/P-build/mb220_buildSdkPatch.sh b/cje-production/P-build/mb220_buildSdkPatch.sh
deleted file mode 100755
index dc7a70d8cda..00000000000
--- a/cje-production/P-build/mb220_buildSdkPatch.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-#*******************************************************************************
-# Copyright (c) 2021 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     Kit Lo - initial API and implementation
-#*******************************************************************************
-set -e
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source $CJE_ROOT/scripts/common-functions.shsource
-source $1
-
-if [[ -z "${WORKSPACE}" ]]
-then
-	MVN_ARGS=""
-else
-	MVN_ARGS="-Pbree-libs -Peclipse-sign"
-fi
-
-mkdir -p $CJE_ROOT/$TMP_DIR
-
-cd $CJE_ROOT/gitCache/eclipse.platform.releng.aggregator
-mvn -f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_OR_BRANCH_LABEL}/pom.xml \
-  clean verify -P${PATCH_OR_BRANCH_LABEL} \
-  -DskipTests=true ${MVN_ARGS} \
-  -Dtycho.debug.artifactcomparator \
-  -Dtycho.localArtifacts=ignore \
-  -Dcbi.jarsigner.continueOnFail=true \
-  -Dtycho.pgp.signer=bc -Dtycho.pgp.signer.bc.secretKeys="${KEYRING}" \
-  -Djgit.dirtyWorkingTree=error \
-  -Dmaven.repo.local=$LOCAL_REPO \
-  -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
-  -DbuildTimestamp=$TIMESTAMP \
-  -DbuildType=$BUILD_TYPE \
-  -DbuildId=$BUILD_ID \
-  -Declipse-p2-repo.url=NOT_FOR_PRODUCTION_USE \
-  ${JAVA_DOC_TOOL}
diff --git a/cje-production/P-build/mb300_gatherEclipseParts.sh b/cje-production/P-build/mb300_gatherEclipseParts.sh
deleted file mode 100755
index 891351a3d63..00000000000
--- a/cje-production/P-build/mb300_gatherEclipseParts.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-#*******************************************************************************
-# Copyright (c) 2019, 2021 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     Kit Lo - initial API and implementation
-#*******************************************************************************
-set -e
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source $CJE_ROOT/scripts/common-functions.shsource
-source $1
-
-mkdir -p $CJE_ROOT/$UPDATES_DIR/$BUILD_ID
-
-JavaCMD=${JAVA_HOME}/bin/java
-
-# gather maven properties
-cp $CJE_ROOT/$AGG_DIR/eclipse-platform-parent/target/mavenproperties.properties  $CJE_ROOT/$DROP_DIR/$BUILD_ID/mavenproperties.properties
-
-# gather repo
-echo $PATCH_BUILD
-PATCH_BUILD_GENERIC=java23patch
-REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository
-  
-if [ -d $REPO_DIR ]; then
-  pushd $REPO_DIR
-  cp -r * $CJE_ROOT/$UPDATES_DIR/$BUILD_ID
-  popd
-fi
diff --git a/cje-production/P-build/mb620_promoteUpdateSite.sh b/cje-production/P-build/mb620_promoteUpdateSite.sh
deleted file mode 100755
index 01a3a6948eb..00000000000
--- a/cje-production/P-build/mb620_promoteUpdateSite.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-#*******************************************************************************
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     Sravan Lakkimsetti - initial API and implementation
-#*******************************************************************************
-set -e
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source $CJE_ROOT/scripts/common-functions.shsource
-source $1
-
-epUpdateDir=/home/data/httpd/download.eclipse.org/eclipse/updates
-dropsPath=${epUpdateDir}/${STREAMMajor}.${STREAMMinor}-${BUILD_TYPE}-builds
-pushd $CJE_ROOT/$UPDATES_DIR
-scp -r ${BUILD_ID} genie.releng@projects-storage.eclipse.org:${dropsPath}/.
-popd
diff --git a/cje-production/mbscripts/mb110_tagBuildInputs.sh b/cje-production/mbscripts/mb110_tagBuildInputs.sh
index 7059d6a532b..d30e9d83d90 100755
--- a/cje-production/mbscripts/mb110_tagBuildInputs.sh
+++ b/cje-production/mbscripts/mb110_tagBuildInputs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #*******************************************************************************
-# Copyright (c) 2019, 2021 IBM Corporation and others.
+# Copyright (c) 2019, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -26,6 +26,7 @@ reportDate=$(TZ="America/New_York" date +%s)
 reportTimestamp=$(TZ="America/New_York" date +%Y%m%d-%H%M --date='@'$reportDate)
 gitLogFile=$CJE_ROOT/$DROP_DIR/$BUILD_ID/gitLog.html
 mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID
+mkdir -p $CJE_ROOT/$TMP_DIR
 
 epUpdateDir=/home/data/httpd/download.eclipse.org/eclipse/updates
 updateSiteRootPath=${epUpdateDir}/${STREAMMajor}.${STREAMMinor}-${BUILD_TYPE}-builds
diff --git a/cje-production/mbscripts/mb220_buildSdkPatch.sh b/cje-production/mbscripts/mb220_buildSdkPatch.sh
index 691a3f3e185..5be8193caa6 100755
--- a/cje-production/mbscripts/mb220_buildSdkPatch.sh
+++ b/cje-production/mbscripts/mb220_buildSdkPatch.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/bash -e
 
 #*******************************************************************************
-# Copyright (c) 2019 IBM Corporation and others.
+# Copyright (c) 2019, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -13,7 +13,6 @@
 # Contributors:
 #     Kit Lo - initial API and implementation
 #*******************************************************************************
-set -e
 
 if [ $# -ne 1 ]; then
   echo USAGE: $0 env_file
@@ -30,8 +29,17 @@ else
 	MVN_ARGS="-Pbree-libs -Peclipse-sign"
 fi
 
+mkdir -p $CJE_ROOT/$TMP_DIR
 cd $CJE_ROOT/gitCache/eclipse.platform.releng.aggregator
-mvn clean install -pl :eclipse-sdk-prereqs,:org.eclipse.jdt.core.compiler.batch -DlocalEcjVersion=99.99 -Dmaven.repo.local=$LOCAL_REPO -DcompilerBaselineMode=disable -DcompilerBaselineReplace=none
+if [ -z "$PATCH_BUILD" ];then
+	mvn clean install -pl :eclipse-sdk-prereqs,:org.eclipse.jdt.core.compiler.batch \
+		-DlocalEcjVersion=99.99 \
+		-Dmaven.repo.local=$LOCAL_REPO -DcompilerBaselineMode=disable -DcompilerBaselineReplace=none
+	MVN_ARGS="${MVN_ARGS} -Dcbi-ecj-version=99.99"
+else
+	MVN_ARGS="${MVN_ARGS} -f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_OR_BRANCH_LABEL}/pom.xml -P${PATCH_OR_BRANCH_LABEL}"
+fi
+
 mvn clean verify -DskipTests=true ${MVN_ARGS} \
   -Dtycho.debug.artifactcomparator \
   -Dtycho.localArtifacts=ignore \
@@ -44,7 +52,6 @@ mvn clean verify -DskipTests=true ${MVN_ARGS} \
   -DbuildType=$BUILD_TYPE \
   -DbuildId=$BUILD_ID \
   -Declipse-p2-repo.url=NOT_FOR_PRODUCTION_USE \
-  -Dcbi-ecj-version=99.99 \
   -e \
   -T 1C \
   ${JAVA_DOC_TOOL}
diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
index 227f318876a..e2200e51844 100755
--- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh
+++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/bash -e
 
 #*******************************************************************************
-# Copyright (c) 2019, 2021 IBM Corporation and others.
+# Copyright (c) 2019, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -13,7 +13,6 @@
 # Contributors:
 #     Kit Lo - initial API and implementation
 #*******************************************************************************
-set -e
 
 if [ $# -ne 1 ]; then
   echo USAGE: $0 env_file
@@ -34,14 +33,12 @@ JavaCMD=${JAVA_HOME}/bin/java
 cp $CJE_ROOT/$AGG_DIR/eclipse-platform-parent/target/mavenproperties.properties  $CJE_ROOT/$DROP_DIR/$BUILD_ID/mavenproperties.properties
 
 # gather repo
-echo $PATCH_BUILD
-if [ -z $PATCH_BUILD ]; then
+echo "PATCH_BUILD: $PATCH_BUILD"
+if [ -z "$PATCH_BUILD" ]; then
   REPO_DIR=$PLATFORM_REPO_DIR
   REPO_ZIP=$PLATFORM_TARGET_DIR/eclipse.platform.repository-${STREAMMajor}.${STREAMMinor}.${STREAMService}-SNAPSHOT.zip
 else
-  PATCH_BUILD_GENERIC=java18patch
-  REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository
-  REPO_ZIP=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/eclipse.releng.repository.$PATCH_BUILD_GENERIC-${STREAMMajor}.${STREAMMinor}.${STREAMService}-SNAPSHOT.zip
+  REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.${PATCH_BUILD}/target/repository
 fi
   
 if [ -d $REPO_DIR ]; then
@@ -49,12 +46,16 @@ if [ -d $REPO_DIR ]; then
   cp -r * $CJE_ROOT/$UPDATES_DIR/$BUILD_ID
   popd
 fi
+
+if [ -n "$PATCH_BUILD" ]; then
+  exit 0 # Nothing more to do for patch-builds
+fi
+
 if [ -f $REPO_ZIP ]; then
   cp $REPO_ZIP $CJE_ROOT/$DROP_DIR/$BUILD_ID/repository-$BUILD_ID.zip
 fi
 
 
-if [ -z $PATCH_BUILD ]; then
   # gather sdk
   if [ -d $PLATFORM_PRODUCTS_DIR ]; then
     pushd $PLATFORM_PRODUCTS_DIR
@@ -131,7 +132,6 @@ if [ -z $PATCH_BUILD ]; then
     popd
   fi
   set +x
-fi
 
 # gather ecj jars
 ECJ_JAR_DIR=$CJE_ROOT/$AGG_DIR/eclipse.jdt.core/org.eclipse.jdt.core.compiler.batch/target
diff --git a/cje-production/mbscripts/mb620_promoteUpdateSite.sh b/cje-production/mbscripts/mb620_promoteUpdateSite.sh
index 62925af1a36..1547ee7327b 100755
--- a/cje-production/mbscripts/mb620_promoteUpdateSite.sh
+++ b/cje-production/mbscripts/mb620_promoteUpdateSite.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/bash -e
 
 #*******************************************************************************
-# Copyright (c) 2019 IBM Corporation and others.
+# Copyright (c) 2019, 2025 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -13,7 +13,6 @@
 # Contributors:
 #     Sravan Lakkimsetti - initial API and implementation
 #*******************************************************************************
-set -e
 
 if [ $# -ne 1 ]; then
   echo USAGE: $0 env_file
@@ -35,6 +34,8 @@ popd
 if [ "$COMPARATOR_ERRORS" == "true" ] && [ "$BUILD_TYPE" == "I" ]
 then
 	exit 0
+elif [ "$BUILD_TYPE" == "P" ]; then
+	exit 0
 fi
 
 epDownloadDir=/home/data/httpd/download.eclipse.org/eclipse