diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index a2476f717f1dc..bc7b9ed47f303 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -2,11 +2,11 @@
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>gradle-enterprise-maven-extension</artifactId>
-        <version>1.17.1</version>
+        <version>1.18</version>
     </extension>
     <extension>
         <groupId>com.gradle</groupId>
         <artifactId>common-custom-user-data-maven-extension</artifactId>
         <version>1.12</version>
     </extension>
-</extensions> 
\ No newline at end of file
+</extensions>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 702aca3c9de7f..ede0ed218ce1f 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -758,6 +758,23 @@
                         </execution>
                     </executions>
                 </plugin>
+
+                <plugin>
+                    <groupId>com.gradle</groupId>
+                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <configuration>
+                        <gradleEnterprise>
+                            <normalization>
+                                <systemProperties>
+                                    <ignoredKeys>
+                                        <ignore>maven.repo.local</ignore>
+                                    </ignoredKeys>
+                                </systemProperties>
+                            </normalization>
+                        </gradleEnterprise>
+                    </configuration>
+                </plugin>
+
             </plugins>
         </pluginManagement>
     </build>
diff --git a/docs/pom.xml b/docs/pom.xml
index c8040d70d2f45..970a3d8332421 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -3176,6 +3176,28 @@
                 </executions>
             </plugin>
         </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.gradle</groupId>
+                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <configuration>
+                        <gradleEnterprise>
+                            <normalization>
+                                <systemProperties>
+                                    <ignoredKeys combine.children="append">
+                                        <ignore>vale.dir</ignore>
+                                        <ignore>git.dir</ignore>
+                                    </ignoredKeys>
+                                </systemProperties>
+                            </normalization>
+                        </gradleEnterprise>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
     </build>
 
     <profiles>
@@ -3204,7 +3226,7 @@
                                 <phase>process-resources</phase>
                                 <goals>
                                     <goal>process-asciidoc</goal>
-                                </goals> 
+                                </goals>
                                 <configuration>
                                     <skip>${skipDocs}</skip>
                                     <backend>pdf</backend>
diff --git a/independent-projects/arc/tcks/cdi-tck-runner/pom.xml b/independent-projects/arc/tcks/cdi-tck-runner/pom.xml
index ccbc8f951ca31..dee0325e3ee0a 100644
--- a/independent-projects/arc/tcks/cdi-tck-runner/pom.xml
+++ b/independent-projects/arc/tcks/cdi-tck-runner/pom.xml
@@ -81,6 +81,26 @@
                 </configuration>
             </plugin>
         </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.gradle</groupId>
+                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <configuration>
+                        <gradleEnterprise>
+                            <normalization>
+                                <systemProperties>
+                                    <ignoredKeys combine.children="append">
+                                        <ignore>org.jboss.cdi.tck.libraryDirectory</ignore>
+                                    </ignoredKeys>
+                                </systemProperties>
+                            </normalization>
+                        </gradleEnterprise>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
 </project>
diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml
index deaa7a0439064..aa608c6c119cb 100644
--- a/independent-projects/parent/pom.xml
+++ b/independent-projects/parent/pom.xml
@@ -420,6 +420,23 @@
                     <artifactId>versions-maven-plugin</artifactId>
                     <version>${version.versions.plugin}</version>
                 </plugin>
+
+                <plugin>
+                    <groupId>com.gradle</groupId>
+                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <configuration>
+                        <gradleEnterprise>
+                            <normalization>
+                                <systemProperties>
+                                    <ignoredKeys>
+                                        <ignore>maven.repo.local</ignore>
+                                    </ignoredKeys>
+                                </systemProperties>
+                            </normalization>
+                        </gradleEnterprise>
+                    </configuration>
+                </plugin>
+
             </plugins>
         </pluginManagement>
     </build>
diff --git a/integration-tests/awt/pom.xml b/integration-tests/awt/pom.xml
index 55b4ba2b2da65..463c04696def2 100644
--- a/integration-tests/awt/pom.xml
+++ b/integration-tests/awt/pom.xml
@@ -166,6 +166,27 @@
                 </executions>
             </plugin>
         </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.gradle</groupId>
+                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <configuration>
+                        <gradleEnterprise>
+                            <normalization>
+                                <systemProperties>
+                                    <ignoredKeys combine.children="append">
+                                        <ignore>native.image.path</ignore>
+                                    </ignoredKeys>
+                                </systemProperties>
+                            </normalization>
+                        </gradleEnterprise>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
     </build>
 
 </project>
diff --git a/integration-tests/mongodb-rest-data-panache/pom.xml b/integration-tests/mongodb-rest-data-panache/pom.xml
index b116d479fa6a6..65748a37ca06c 100644
--- a/integration-tests/mongodb-rest-data-panache/pom.xml
+++ b/integration-tests/mongodb-rest-data-panache/pom.xml
@@ -113,6 +113,26 @@
                 </configuration>
             </plugin>
         </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.gradle</groupId>
+                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <configuration>
+                        <gradleEnterprise>
+                            <normalization>
+                                <systemProperties>
+                                    <ignoredKeys combine.children="append">
+                                        <ignore>quarkus.kubernetes-service-binding.root</ignore>
+                                    </ignoredKeys>
+                                </systemProperties>
+                            </normalization>
+                        </gradleEnterprise>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 4d581c0c235cc..db0d9e8709504 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -93,22 +93,22 @@
                 <artifactId>gradle-enterprise-maven-extension</artifactId>
                 <configuration>
                     <gradleEnterprise>
-                    <plugins>
-                        <plugin>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <inputs>
-                            <fileSets>
-                            <fileSet>
-                                <name>specs</name>
-                                <paths>
-                                <path>${project.basedir}/disable-unbind-executions</path>
-                                </paths>
-                                <normalization>RELATIVE_PATH</normalization>
-                            </fileSet>
-                            </fileSets>
-                        </inputs>
-                        </plugin>
-                    </plugins>
+                        <plugins>
+                            <plugin>
+                                <artifactId>maven-compiler-plugin</artifactId>
+                                <inputs>
+                                    <fileSets combine.children="append">
+                                        <fileSet>
+                                            <name>specs</name>
+                                            <paths>
+                                                <path>${project.basedir}/disable-unbind-executions</path>
+                                            </paths>
+                                            <normalization>RELATIVE_PATH</normalization>
+                                        </fileSet>
+                                    </fileSets>
+                                </inputs>
+                            </plugin>
+                        </plugins>
                     </gradleEnterprise>
                 </configuration>
                 </plugin>
diff --git a/integration-tests/rest-client/pom.xml b/integration-tests/rest-client/pom.xml
index 157c49c77281e..a52c84cf8b725 100644
--- a/integration-tests/rest-client/pom.xml
+++ b/integration-tests/rest-client/pom.xml
@@ -200,6 +200,27 @@
                 </configuration>
             </plugin>
         </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>com.gradle</groupId>
+                    <artifactId>gradle-enterprise-maven-extension</artifactId>
+                    <configuration>
+                        <gradleEnterprise>
+                            <normalization>
+                                <systemProperties>
+                                    <ignoredKeys combine.children="append">
+                                        <ignore>javax.net.ssl.trustStore</ignore>
+                                        <ignore>rest-client.trustStore</ignore>
+                                    </ignoredKeys>
+                                </systemProperties>
+                            </normalization>
+                        </gradleEnterprise>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <profiles>
diff --git a/integration-tests/test-extension/tests/pom.xml b/integration-tests/test-extension/tests/pom.xml
index 588e71eaf3237..3f85d5c70e161 100644
--- a/integration-tests/test-extension/tests/pom.xml
+++ b/integration-tests/test-extension/tests/pom.xml
@@ -94,9 +94,14 @@
           <artifactId>gradle-enterprise-maven-extension</artifactId>
           <configuration>
             <gradleEnterprise>
-              <normalization combine.children="append">
+              <normalization>
+                <systemProperties>
+                  <ignoredKeys combine.children="append">
+                    <ignore>classpathEntriesRecordingFile</ignore>
+                  </ignoredKeys>
+                </systemProperties>
                 <runtimeClassPath>
-                  <propertiesNormalizations>
+                  <propertiesNormalizations combine.children="append">
                     <propertiesNormalization>
                       <path>application.properties</path>
                       <ignoredProperties>