diff --git a/build.gradle.kts b/build.gradle.kts
index e4d5635f9..e0b4d0b74 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -141,8 +141,14 @@ dependencies {
 
 	implementation("thedarkcolour:kotlinforforge:$kotlin_for_forge_version")
 
-	jarJar("ru.dbotthepony.kommons:kommons-mc:[$kommons_version,)") { setTransitive(false) }
-	implementation("ru.dbotthepony.kommons:kommons-mc:[$kommons_version,)") { setTransitive(false) }
+	jarJar("ru.dbotthepony.kommons:kommons:[$kommons_version,)") { setTransitive(false) }
+	implementation("ru.dbotthepony.kommons:kommons:[$kommons_version,)") { setTransitive(false) }
+
+	jarJar("ru.dbotthepony.kommons:kommons-gson:[$kommons_version,)") { setTransitive(false) }
+	implementation("ru.dbotthepony.kommons:kommons-gson:[$kommons_version,)") { setTransitive(false) }
+
+	jarJar("ru.dbotthepony.kommons:kommons-guava:[$kommons_version,)") { setTransitive(false) }
+	implementation("ru.dbotthepony.kommons:kommons-guava:[$kommons_version,)") { setTransitive(false) }
 
 	compileOnly("yalter.mousetweaks:MouseTweaks:2.23:api")
 	annotationProcessor("org.spongepowered:mixin:${mixin_version}:processor")
@@ -331,6 +337,10 @@ tasks.jarJar.configure {
 	archiveVersion.set(gitVersion.jarName)
 }
 
+tasks.assemble.configure {
+	dependsOn(tasks.jarJar)
+}
+
 tasks.withType(ProcessResources::class.java) {
 	val replaceProperties = mapOf(
 			"mc_version"	to mc_version,
@@ -348,12 +358,6 @@ tasks {
 		archiveClassifier.set("sources")
 		from(sourceSets.main.get().allSource)
 	}
-
-	create("deobfJar", org.gradle.jvm.tasks.Jar::class.java) {
-		archiveClassifier.set("deobf")
-		from(sourceSets.main.get().output)
-		attachManifest()
-	}
 }
 
 if (project.hasProperty("mavenUser") && project.hasProperty("mavenPassword") && project.hasProperty("mavenUrl")) {
@@ -367,7 +371,6 @@ if (project.hasProperty("mavenUser") && project.hasProperty("mavenPassword") &&
 				// from(components["java"])
 				artifact(tasks["jar"])
 				artifact(tasks["sourceJar"])
-				artifact(tasks["deobfJar"])
 
 				version = gitVersion.publishVersion
 
diff --git a/gradle.properties b/gradle.properties
index f0740484b..05970b0c2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ forge_version=21.1.1
 mixingradle_version=0.7.33
 mixin_version=0.8.5
 
-kommons_version=3.1.0
+kommons_version=3.1.1
 
 jei_version=19.8.2.99
 jupiter_version=5.9.2