diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 00000000000..8457d47cfe9
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1 @@
+-DaggregatorBuild=true
diff --git a/Jenkinsfile b/Jenkinsfile
index da028596577..47b8551fde2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -55,10 +55,9 @@ pipeline {
 					mvn clean verify -e -Dmaven.repo.local=$WORKSPACE/.m2/repository \
 						-Pbree-libs \
 						${MVN_ARGS} \
-						-Dmaven.test.skip=true -DskipTests=true -DaggregatorBuild=true \
+						-Dmaven.test.skip=true -DskipTests=true \
 						-DapiBaselineTargetDirectory=${WORKSPACE} \
 						-Dgpg.passphrase="${KEYRING_PASSPHRASE}" \
-						-Dproject.build.sourceEncoding=UTF-8 \
 						-Dcbi-ecj-version=99.99
 					'''
 				}
diff --git a/cje-production/P-build/mb220_buildSdkPatch.sh b/cje-production/P-build/mb220_buildSdkPatch.sh
index c4c0df7a042..351782b4f83 100755
--- a/cje-production/P-build/mb220_buildSdkPatch.sh
+++ b/cje-production/P-build/mb220_buildSdkPatch.sh
@@ -42,7 +42,6 @@ mvn -f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_OR_BRANCH_LABEL}/pom.
   -Djgit.dirtyWorkingTree=error \
   -Dmaven.repo.local=$LOCAL_REPO \
   -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
-  -DaggregatorBuild=true \
   -DbuildTimestamp=$TIMESTAMP \
   -DbuildType=$BUILD_TYPE \
   -DbuildId=$BUILD_ID \
diff --git a/cje-production/mbscripts/mb220_buildSdkPatch.sh b/cje-production/mbscripts/mb220_buildSdkPatch.sh
index 69387cd5b81..a4b70dddcf5 100755
--- a/cje-production/mbscripts/mb220_buildSdkPatch.sh
+++ b/cje-production/mbscripts/mb220_buildSdkPatch.sh
@@ -39,7 +39,6 @@ mvn clean verify -DskipTests=true ${MVN_ARGS} \
   -Djgit.dirtyWorkingTree=error \
   -Dmaven.repo.local=$LOCAL_REPO \
   -Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
-  -DaggregatorBuild=true \
   -DbuildTimestamp=$TIMESTAMP \
   -DbuildType=$BUILD_TYPE \
   -DbuildId=$BUILD_ID \
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 02cd7cdf6fe..8a401671404 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -670,7 +670,7 @@
       <id>build-individual-bundles</id>
       <activation>
         <property>
-          <!-- Enable if aggregatorBuild property is not set -->
+          <!-- Enable if aggregatorBuild system-property is not set -->
           <name>!aggregatorBuild</name>
         </property>
       </activation>
diff --git a/pom.xml b/pom.xml
index bb3f758d1fb..1ecf6d9a04b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,10 +20,6 @@
   <artifactId>platform-aggregator</artifactId>
   <version>4.30.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <properties>
-    <!--Property used in parent pom which if defined disables activation of build-individual-bundles profile -->
-    <aggregatorBuild>true</aggregatorBuild>
-  </properties>
   <pluginRepositories>
 	<pluginRepository>
 		<id>tycho-snapshots</id>