diff --git a/build.gradle.kts b/build.gradle.kts
index c8390f59..8ea307f2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -50,6 +50,7 @@ subprojects {
         maven("https://repo.spongepowered.org/maven")
         maven("https://repo.viaversion.com")
         maven("https://repo.maven.apache.org/maven2/")
+        mavenLocal()
     }
 
     indra {
@@ -62,6 +63,15 @@ subprojects {
         }
         mitLicense()
     }
+
+    publishing.repositories.maven {
+        name = "Via"
+        url = uri("https://repo.viaversion.com/")
+        credentials(PasswordCredentials::class)
+        authentication {
+            create<BasicAuthentication>("basic")
+        }
+    }
 }
 
 tasks {
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
index f8d1567c..fca0e0d5 100644
--- a/buildSrc/src/main/kotlin/Versions.kt
+++ b/buildSrc/src/main/kotlin/Versions.kt
@@ -6,6 +6,8 @@ object Versions {
     const val netty = "4.0.20.Final"
     const val gson = "2.8.6"
     const val jetbrainsAnnotations = "19.0.0"
+    const val log4j = "2.8.1"
+    const val fabricLoader = "0.4.8+build.154"
 
     // Platforms
     const val spigot = "1.16.5-R0.1-SNAPSHOT"
diff --git a/buildSrc/src/main/kotlin/extensions.kt b/buildSrc/src/main/kotlin/extensions.kt
index 8aef8e74..df822671 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
@@ -18,6 +19,11 @@ fun Project.configureShadowJar() {
         getByName("build") {
             dependsOn(withType<ShadowJar>())
         }
+        withType<Jar> {
+            if (name == "jar") {
+                archiveClassifier.set("unshaded")
+            }
+        }
     }
 }
 
diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
index a12310ed..2bd07e82 100644
--- a/fabric/build.gradle.kts
+++ b/fabric/build.gradle.kts
@@ -1,5 +1,5 @@
 dependencies {
     implementation(project(":viabackwards-common"))
-    compileOnly("net.fabricmc", "fabric-loader", "0.4.8+build.154")
-    compileOnly("org.apache.logging.log4j", "log4j-api", "2.8.1")
+    compileOnly("net.fabricmc", "fabric-loader", Versions.fabricLoader)
+    compileOnly("org.apache.logging.log4j", "log4j-api", Versions.log4j)
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ae6728fc..0e90bdbe 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,10 @@ setupViaSubproject("bungee")
 setupViaSubproject("velocity")
 setupViaSubproject("sponge")
 setupViaSubproject("fabric")
-setupViaSubproject("universal")
+
+setupSubproject("viabackwards") {
+    projectDir = file("universal")
+}
 
 fun setupViaSubproject(name: String) {
     setupSubproject("viabackwards-$name") {
diff --git a/universal/build.gradle.kts b/universal/build.gradle.kts
index 1ab0520c..b4456ddc 100644
--- a/universal/build.gradle.kts
+++ b/universal/build.gradle.kts
@@ -1,6 +1,10 @@
+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)
+    withType<ShadowJar> {
         archiveClassifier.set("")
         archiveFileName.set("ViaBackwards-${project.version}.jar")
         destinationDirectory.set(rootProject.projectDir.resolve("build/libs"))
@@ -19,6 +23,11 @@ tasks {
         }
     }
     build {
-        dependsOn(universalJar)
+        dependsOn(withType<ShadowJar>())
+    }
+    withType<Jar> {
+        if (name == "jar") {
+            archiveClassifier.set("unshaded")
+        }
     }
 }