diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f58e7139..5178e9e2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,7 @@ jobs:
 
       - name: Build with Java ${{ matrix.java }}
         run: |
-          mvn --batch-mode -T 1C clean org.jacoco:jacoco-maven-plugin:prepare-agent install \
+          mvn --batch-mode -T 1C clean install \
               -Djava.version=${{ matrix.java }}
         env:
           OSSINDEX_USERNAME: ${{ secrets.OSSINDEX_USERNAME }}
diff --git a/doc/developer_guide.md b/doc/developer_guide.md
index f5b2ea36..2ad974fa 100644
--- a/doc/developer_guide.md
+++ b/doc/developer_guide.md
@@ -176,8 +176,7 @@ mvn -T 1C --update-snapshots versions:use-latest-releases versions:update-proper
 ## Run local sonar analysis
 
 ```sh
-mvn -T 1C clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar \
-    -Dsonar.token=[token]
+mvn -T 1C clean package sonar:sonar -Dsonar.token=[token]
 ```
 
 See analysis results at [sonarcloud.io](https://sonarcloud.io/dashboard?id=org.itsallcode.openfasttrace%3Aopenfasttrace).
diff --git a/parent/pom.xml b/parent/pom.xml
index ca0ad035..774f8af4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -346,6 +346,13 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.8.14</version>
                 <executions>
+                    <execution>
+                        <id>prepare-agent</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
                     <execution>
                         <id>merge-results</id>
                         <phase>verify</phase>
@@ -400,7 +407,7 @@
                     </systemPropertyVariables>
                     <useModulePath>true</useModulePath>
                     <argLine>
-                        <!-- Required for Java >= 18 --> ${test.args} -javaagent:${org.mockito:mockito-core:jar}</argLine>
+                        <!-- Keep JaCoCo agent args and add Mockito agent (required for Java >= 18) --> @{argLine} ${test.args} -javaagent:${org.mockito:mockito-core:jar}</argLine>
                 </configuration>
             </plugin>
             <plugin>
@@ -414,7 +421,7 @@
                         <test.coverage>true</test.coverage>
                     </systemPropertyVariables>
                     <useModulePath>true</useModulePath>
-                    <argLine><!-- Required for Java >= 18 --> ${test.args} -javaagent:${org.mockito:mockito-core:jar}</argLine>
+                    <argLine><!-- Keep JaCoCo agent args and add Mockito agent (required for Java >= 18) --> @{argLine} ${test.args} -javaagent:${org.mockito:mockito-core:jar}</argLine>
                 </configuration>
                 <executions>
                     <execution>