diff --git a/build.gradle.kts b/build.gradle.kts
index 8189afe..27fa003 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jreleaser.model.Active
 import org.jreleaser.model.Distribution
 import org.jreleaser.model.Stereotype
@@ -13,7 +14,7 @@ import java.util.*
  */
 
 plugins {
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("com.gradleup.shadow") version "8.3.5"
     id("io.micronaut.application") version "4.4.3"
     id("org.jreleaser") version "1.14.0"
 }
@@ -65,6 +66,11 @@ dependencies {
     implementation("ch.qos.logback:logback-classic:1.5.11")
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
 application {
     applicationName = "subpop"
     mainClass = "io.clusterless.subpop.Main"
@@ -76,9 +82,16 @@ distributions {
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+tasks.withType<ShadowJar>{
+    archiveBaseName.set("subpop")
+}
+
+tasks.named<Zip>("shadowDistZip") {
+    archiveBaseName.set("subpop")
+}
+
+tasks.named<Tar>("shadowDistTar") {
+    archiveBaseName.set("subpop")
 }
 
 tasks.withType<Test> {
@@ -194,7 +207,7 @@ jreleaser {
 }
 
 tasks.register("release") {
-    dependsOn("distZip")
+    dependsOn("shadowDistZip")
     dependsOn("jreleaserRelease")
     dependsOn("jreleaserPackage")
     dependsOn("jreleaserPublish")