diff --git a/codeflash-java-runtime/build.gradle.kts b/codeflash-java-runtime/build.gradle.kts
index 524d8944e..9a4ac3337 100644
--- a/codeflash-java-runtime/build.gradle.kts
+++ b/codeflash-java-runtime/build.gradle.kts
@@ -47,7 +47,12 @@ tasks.shadowJar {
     archiveVersion.set("1.0.0")
     archiveClassifier.set("")
 
-    relocate("org.objectweb.asm", "com.codeflash.asm")
+    relocate("org.objectweb.asm", "com.codeflash.shaded.org.objectweb.asm")
+    relocate("com.google.gson", "com.codeflash.shaded.com.google.gson")
+    relocate("com.esotericsoftware", "com.codeflash.shaded.com.esotericsoftware")
+    relocate("org.objenesis", "com.codeflash.shaded.org.objenesis")
+    relocate("org.slf4j", "com.codeflash.shaded.org.slf4j")
+    relocate("org.jacoco", "com.codeflash.shaded.org.jacoco")
 
     manifest {
         attributes(
diff --git a/codeflash-java-runtime/pom.xml b/codeflash-java-runtime/pom.xml
index e9edf7ea7..36099feda 100644
--- a/codeflash-java-runtime/pom.xml
+++ b/codeflash-java-runtime/pom.xml
@@ -156,7 +156,35 @@
                             <relocations>
                                 <relocation>
                                     <pattern>org.objectweb.asm</pattern>
-                                    <shadedPattern>com.codeflash.asm</shadedPattern>
+                                    <shadedPattern>com.codeflash.shaded.org.objectweb.asm</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.google.gson</pattern>
+                                    <shadedPattern>com.codeflash.shaded.com.google.gson</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.esotericsoftware</pattern>
+                                    <shadedPattern>com.codeflash.shaded.com.esotericsoftware</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.objenesis</pattern>
+                                    <shadedPattern>com.codeflash.shaded.org.objenesis</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.slf4j</pattern>
+                                    <shadedPattern>com.codeflash.shaded.org.slf4j</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.jacoco</pattern>
+                                    <shadedPattern>com.codeflash.shaded.org.jacoco</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.kohsuke</pattern>
+                                    <shadedPattern>com.codeflash.shaded.org.kohsuke</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>com.vladium</pattern>
+                                    <shadedPattern>com.codeflash.shaded.com.vladium</shadedPattern>
                                 </relocation>
                             </relocations>
                             <transformers>
diff --git a/codeflash/languages/java/gradle_strategy.py b/codeflash/languages/java/gradle_strategy.py
index 095ecc956..9c17a6cb3 100644
--- a/codeflash/languages/java/gradle_strategy.py
+++ b/codeflash/languages/java/gradle_strategy.py
@@ -40,7 +40,13 @@
         try { tasks.withType(Pmd) { enabled = false } } catch (e) {}
         // Disable remaining validation tasks by name
         tasks.matching { task ->
-            task.name in ['rat', 'japicmp']
+            task.name in [
+                'checkstyleMain', 'checkstyleTest',
+                'spotbugsMain', 'spotbugsTest',
+                'pmdMain', 'pmdTest',
+                'rat', 'japicmp',
+                'jarHell', 'thirdPartyAudit'
+            ]
         }.configureEach {
             enabled = false
         }