diff --git a/bootstrap/fabric/build.gradle.kts b/bootstrap/fabric/build.gradle.kts
index ef526aa00..5c2409be8 100644
--- a/bootstrap/fabric/build.gradle.kts
+++ b/bootstrap/fabric/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("fabric-loom") version "0.12-SNAPSHOT"
+    id("fabric-loom") version "1.0-SNAPSHOT"
     id("maven-publish")
     id("com.github.johnrengelman.shadow")
     id("java")
@@ -79,6 +79,7 @@ tasks {
         relocate("org.yaml", "org.geysermc.relocate.yaml") // https://github.com/CardboardPowered/cardboard/issues/139
         relocate("com.fasterxml.jackson", "org.geysermc.relocate.jackson")
         relocate("net.kyori", "org.geysermc.relocate.kyori")
+        archiveClassifier.set("unshaded") // We don't want it included in the archived artifacts
     }
 
     jar {
@@ -87,7 +88,7 @@ tasks {
 
     remapJar {
         dependsOn(shadowJar)
-        inputs.file(shadowJar.get().archiveFile)
+        inputFile.set(shadowJar.get().archiveFile)
         archiveBaseName.set("Geyser-Fabric")
         archiveClassifier.set("")
         archiveVersion.set("")
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 6f4647c0f..c992a3ca9 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -6,21 +6,17 @@ plugins {
 
 repositories {
     gradlePluginPortal()
+    maven("https://repo.opencollab.dev/maven-snapshots")
 }
 
 dependencies {
     implementation("net.kyori", "indra-common", "2.0.6")
     implementation("org.jfrog.buildinfo", "build-info-extractor-gradle", "4.26.1")
-    implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.2") {
-        exclude("org.ow2.asm", "*")
-    }
+    implementation("com.github.johnrengelman", "shadow", "7.1.3-SNAPSHOT")
 
     // Within the gradle plugin classpath, there is a version conflict between loom and some other
     // plugin for databind. This fixes it: minimum 2.13.2 is required by loom.
     implementation("com.fasterxml.jackson.core:jackson-databind:2.13.3")
-
-    // Use a newer version of ObjectWeb ASM than the one provided by loom.
-    implementation("org.ow2.asm:asm-commons:9.4")
 }
 
 tasks.withType<KotlinCompile> {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b61fefc31..6f212d3ac 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -48,6 +48,7 @@ pluginManagement {
     repositories {
         gradlePluginPortal()
         maven("https://maven.fabricmc.net/")
+        maven("https://repo.opencollab.dev/maven-snapshots")
     }
     plugins {
         id("net.kyori.blossom") version "1.2.0"