diff --git a/build.gradle.kts b/build.gradle.kts
index c3618917d..786fb8138 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -68,6 +68,12 @@ subprojects {
         }
         mitLicense()
     }
+
+    publishing.repositories.maven {
+        name = "Via"
+        url = uri("https://repo.viaversion.com/")
+        credentials(PasswordCredentials::class)
+    }
 }
 
 tasks {
diff --git a/buildSrc/src/main/kotlin/extensions.kt b/buildSrc/src/main/kotlin/extensions.kt
index b7dd3c945..7399446ad 100644
--- a/buildSrc/src/main/kotlin/extensions.kt
+++ b/buildSrc/src/main/kotlin/extensions.kt
@@ -1,6 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
 import org.gradle.api.Project
+import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.invoke
 import org.gradle.kotlin.dsl.withType
@@ -10,16 +11,20 @@ fun Project.configureShadowJar() {
     apply<ShadowPlugin>()
     tasks {
         withType<ShadowJar> {
-            archiveClassifier.set("jar")
+            archiveClassifier.set("")
             archiveFileName.set("ViaVersion-${project.name.substringAfter("viaversion-").capitalize()}-${project.version}.jar")
             destinationDirectory.set(rootProject.projectDir.resolve("build/libs"))
-            //minimize() // ?
             configureRelocations()
             configureExcludes()
         }
         getByName("build") {
             dependsOn(withType<ShadowJar>())
         }
+        withType<Jar> {
+            if (name == "jar") {
+                archiveClassifier.set("unshaded")
+            }
+        }
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b7bbb3a32..8dc8a7043 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -8,7 +8,10 @@ setupViaSubproject("velocity")
 setupViaSubproject("sponge")
 setupViaSubproject("sponge-legacy")
 setupViaSubproject("fabric")
-setupViaSubproject("universal")
+
+setupSubproject("viaversion") {
+    projectDir = file("universal")
+}
 
 fun setupViaSubproject(name: String) {
     setupSubproject("viaversion-$name") {
diff --git a/universal/build.gradle.kts b/universal/build.gradle.kts
index aa49a70e6..c55fa450f 100644
--- a/universal/build.gradle.kts
+++ b/universal/build.gradle.kts
@@ -1,7 +1,11 @@
+import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+apply<ShadowPlugin>()
+
 tasks {
-    val universalJar = register<Jar>("universalJar") {
-        artifacts.add("archives", this)
-        archiveClassifier.set("jar")
+    withType<ShadowJar> {
+        archiveClassifier.set("")
         archiveFileName.set("ViaVersion-${project.version}.jar")
         destinationDirectory.set(rootProject.projectDir.resolve("build/libs"))
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -19,6 +23,11 @@ tasks {
         }
     }
     build {
-        dependsOn(universalJar)
+        dependsOn(withType<ShadowJar>())
+    }
+    withType<Jar> {
+        if (name == "jar") {
+            archiveClassifier.set("unshaded")
+        }
     }
 }