diff --git a/build.gradle b/build.gradle
index 949f11850..fbca8dfae 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,22 @@
+// Needed until shadow plugin is updated for JDK21. For more details see
+// https://github.com/Netflix/spectator/issues/1113
+buildscript {
+  configurations.configureEach { configuration ->
+    configuration.resolutionStrategy {
+      eachDependency { DependencyResolveDetails details ->
+        if (details.requested.group == 'org.ow2.asm') {
+          details.useVersion '9.6'
+          details.because "Asm 9.6 is required for JDK 21+ support"
+        }
+      }
+    }
+  }
+}
+
 plugins {
   id 'com.github.ben-manes.versions' version '0.50.0'
   id 'com.github.spotbugs' version '5.2.5' apply false
+  id "com.github.johnrengelman.shadow" version "8.1.1" apply false
   id 'me.champeau.jmh' version '0.7.2'
   id 'com.netflix.nebula.dependency-recommender' version '12.2.0'
   id 'com.netflix.nebula.netflixoss' version '11.4.0'
diff --git a/spectator-agent/build.gradle b/spectator-agent/build.gradle
index c73253271..daaac16e7 100644
--- a/spectator-agent/build.gradle
+++ b/spectator-agent/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'io.github.goooler.shadow' version '8.1.3'
+  id "com.github.johnrengelman.shadow"
 }
 
 dependencies {
diff --git a/spectator-ext-spark/build.gradle b/spectator-ext-spark/build.gradle
index af6c54d2d..835b293f0 100644
--- a/spectator-ext-spark/build.gradle
+++ b/spectator-ext-spark/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'io.github.goooler.shadow' version '8.1.3'
+  id "com.github.johnrengelman.shadow"
 }
 
 dependencies {
diff --git a/spectator-reg-atlas/build.gradle b/spectator-reg-atlas/build.gradle
index bccdb0b55..3920834b8 100644
--- a/spectator-reg-atlas/build.gradle
+++ b/spectator-reg-atlas/build.gradle
@@ -1,7 +1,7 @@
 import java.util.zip.ZipFile
 
 plugins {
-  id 'io.github.goooler.shadow' version '8.1.3'
+    id "com.github.johnrengelman.shadow"
 }
 
 dependencies {
@@ -51,7 +51,6 @@ afterEvaluate {
   publishing {
     publications {
       withType(MavenPublication) {
-        artifact(shadowJar)
         pom.withXml {
           asNode()
             .dependencies
diff --git a/spectator-web-spring/build.gradle b/spectator-web-spring/build.gradle
index 6691a8f2e..3feec817b 100644
--- a/spectator-web-spring/build.gradle
+++ b/spectator-web-spring/build.gradle
@@ -16,7 +16,7 @@
 import java.util.zip.ZipFile
 
 plugins {
-  id 'io.github.goooler.shadow' version '8.1.3'
+  id "com.github.johnrengelman.shadow"
 }
 
 dependencies {
@@ -65,7 +65,6 @@ afterEvaluate {
   publishing {
     publications {
       withType(MavenPublication) {
-        artifact(shadowJar)
         pom.withXml {
           asNode()
               .dependencies