diff --git a/build.gradle.kts b/build.gradle.kts
index ac7f59e71..8e25c97bd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,8 +1,8 @@
 import com.gradle.enterprise.gradleplugin.GradleEnterpriseExtension
 
 plugins {
-    id("io.papermc.paperweight.userdev") version "1.7.1" apply false
-    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
+    id("io.papermc.paperweight.userdev") version "1.7.2" apply false
+    id("com.gradleup.shadow") version "8.3.0" apply false
     id("xyz.jpenilla.run-paper") version "2.2.2" apply false
 }
 
diff --git a/plugins/banstick-paper/build.gradle.kts b/plugins/banstick-paper/build.gradle.kts
index 5eecb3b8d..300855a84 100644
--- a/plugins/banstick-paper/build.gradle.kts
+++ b/plugins/banstick-paper/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("io.papermc.paperweight.userdev")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 version = "2.0.1"
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
index 054e48822..8cf768307 100644
--- a/plugins/build.gradle.kts
+++ b/plugins/build.gradle.kts
@@ -1,4 +1,5 @@
 import io.papermc.paperweight.tasks.RemapJar
+import io.papermc.paperweight.userdev.PaperweightUserExtension
 import xyz.jpenilla.runpaper.task.RunServer
 
 subprojects {
@@ -42,16 +43,10 @@ subprojects {
         publications {
             create<MavenPublication>("maven") {
                 from(components["java"])
-                pluginManager.withPlugin("io.papermc.paperweight.userdev") {
-                    artifact(project.tasks.withType<RemapJar>().getByName("reobfJar").outputJar)
-                }
             }
-            pluginManager.withPlugin("com.github.johnrengelman.shadow") {
+            pluginManager.withPlugin("com.gradleup.shadow") {
                 create<MavenPublication>("shadow") {
                     from(components["java"])
-                    pluginManager.withPlugin("io.papermc.paperweight.userdev") {
-                        artifact(project.tasks.withType<RemapJar>().getByName("reobfJar").outputJar)
-                    }
                 }
             }
         }
@@ -62,20 +57,17 @@ subprojects {
     }
 
     pluginManager.withPlugin("io.papermc.paperweight.userdev") {
+        project.extensions.getByName<PaperweightUserExtension>("paperweight")
+            .reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
+
         tasks.withType<ProcessResources> {
             filesMatching("plugin.yml") {
                 expand(project.properties)
             }
         }
-
-        tasks {
-            named("build") {
-                dependsOn("reobfJar")
-            }
-        }
     }
 
-    pluginManager.withPlugin("com.github.johnrengelman.shadow") {
+    pluginManager.withPlugin("com.gradleup.shadow") {
         tasks {
             named("build") {
                 dependsOn("shadowJar")
diff --git a/plugins/civmodcore-paper/build.gradle.kts b/plugins/civmodcore-paper/build.gradle.kts
index 6f757eb3b..981b9c1f8 100644
--- a/plugins/civmodcore-paper/build.gradle.kts
+++ b/plugins/civmodcore-paper/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("io.papermc.paperweight.userdev")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
     id("xyz.jpenilla.run-paper")
 }
 
diff --git a/plugins/civspy-paper/build.gradle.kts b/plugins/civspy-paper/build.gradle.kts
index c20dc9bb5..ed012a7df 100644
--- a/plugins/civspy-paper/build.gradle.kts
+++ b/plugins/civspy-paper/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("io.papermc.paperweight.userdev")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
     id("xyz.jpenilla.run-paper")
 }
 
diff --git a/plugins/kirabukkitgateway-paper/build.gradle.kts b/plugins/kirabukkitgateway-paper/build.gradle.kts
index 5b7469e10..5f2f6357f 100644
--- a/plugins/kirabukkitgateway-paper/build.gradle.kts
+++ b/plugins/kirabukkitgateway-paper/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("io.papermc.paperweight.userdev")
-    id("com.github.johnrengelman.shadow")
+    id("com.gradleup.shadow")
 }
 
 version = "2.0.3"