diff --git a/apm-agent-bootstrap/pom.xml b/apm-agent-bootstrap/pom.xml
index cf5893c2cb..783bc0a888 100644
--- a/apm-agent-bootstrap/pom.xml
+++ b/apm-agent-bootstrap/pom.xml
@@ -60,6 +60,18 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <!-- '.esclazz' resources have to be excluded as they are re-generated after shading from '.class' -->
+                    <execution>
+                        <id>default-jar</id>
+                        <configuration>
+                            <includes>**/*.class</includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
                 <executions>
@@ -103,13 +115,19 @@
                                 with regular classloading. Their content will be injected as resources into the bootstrap
                                 classloader -->
 
+                                <delete dir="${tmpdir}"/>
                                 <mkdir dir="${tmpdir}"/>
+
                                 <unzip dest="${tmpdir}" src="${project.basedir}/target/${project.build.finalName}.jar"/>
+
+                                <delete dir="${tmpdir}/bootstrap"/>
                                 <mkdir dir="${tmpdir}/bootstrap"/>
+
                                 <move todir="${tmpdir}/bootstrap">
                                     <fileset dir="${tmpdir}" includes="**/*.class"/>
                                     <mapper type="regexp" from="^(.*)\.class$$" to="\1\.esclazz"/>
                                 </move>
+
                                 <delete dir="${tmpdir}/java"/>
                                 <delete dir="${tmpdir}/co"/>
                                 <delete dir="${tmpdir}/META-INF"/>
diff --git a/apm-agent-bootstrap/src/main/resources/bootstrap/co/elastic/apm/agent/modulesetter/ModuleSetter.esclazz b/apm-agent-bootstrap/src/main/resources/bootstrap/co/elastic/apm/agent/modulesetter/ModuleSetter.esclazz
index b73dbacd2f..95fc2a6850 100644
Binary files a/apm-agent-bootstrap/src/main/resources/bootstrap/co/elastic/apm/agent/modulesetter/ModuleSetter.esclazz and b/apm-agent-bootstrap/src/main/resources/bootstrap/co/elastic/apm/agent/modulesetter/ModuleSetter.esclazz differ
diff --git a/apm-agent-bootstrap/src/main/resources/bootstrap/java/lang/IndyBootstrapDispatcher.esclazz b/apm-agent-bootstrap/src/main/resources/bootstrap/java/lang/IndyBootstrapDispatcher.esclazz
index 544cd281f8..8bdc67e7fd 100644
Binary files a/apm-agent-bootstrap/src/main/resources/bootstrap/java/lang/IndyBootstrapDispatcher.esclazz and b/apm-agent-bootstrap/src/main/resources/bootstrap/java/lang/IndyBootstrapDispatcher.esclazz differ
diff --git a/pom.xml b/pom.xml
index 117b4417a4..35eb9c30b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,7 +362,6 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.7</version>
                 <configuration>
                     <excludes>**/*.esclazz</excludes>
                 </configuration>
@@ -477,7 +476,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.5</version>
+                    <version>0.8.7</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>