diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 6bd1515..3f5ae49 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           dependency-graph: generate-and-submit
       - name: Build with Gradle
-        run: ./gradlew protoJar
+        run: ./gradlew build
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
index b87d34c..3a45a64 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,6 +16,7 @@ plugins {
     id("java")
     `maven-publish`
     alias(libs.plugins.protobuf)
+    alias(libs.plugins.shadow)
 }
 
 repositories {
@@ -64,3 +65,14 @@ tasks.register<Jar>("protoJar") {
     archiveClassifier.set("proto")
     from("src/generated/main/java")
 }
+
+tasks {
+    shadowJar {
+        archiveClassifier.set("")
+        mergeServiceFiles()
+    }
+
+    build {
+        dependsOn(shadowJar)
+    }
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c0924be..3cddc56 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,6 +4,7 @@
 [versions]
 protobuf = "4.32.1"
 protobufPlugin = "0.9.5"
+shadow = "9.2.0"
 
 [libraries]
 protoJava = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" }
@@ -11,3 +12,4 @@ protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "protob
 
 [plugins]
 protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }