diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index bc9685e0a..89890f675 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -8,14 +8,17 @@ plugins {
 repositories {
     mavenCentral()
     gradlePluginPortal()
-    maven {
-        name = "PaperMC"
-        url = uri("https://papermc.io/repo/repository/maven-public/")
-    }
     maven {
         name = "EngineHub"
         url = uri("https://maven.enginehub.org/repo/")
     }
+    maven {
+        name = "PaperMC"
+        url = uri("https://papermc.io/repo/repository/maven-public/")
+        content {
+            includeGroupByRegex("io\\.papermc\\..*")
+        }
+    }
 }
 
 val properties = Properties().also { props ->
@@ -28,7 +31,7 @@ dependencies {
     implementation(gradleApi())
     implementation("org.ajoberstar.grgit:grgit-gradle:4.1.0")
     implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.0")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.2.0")
+    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.0-SNAPSHOT")
 }
 
 kotlin {
diff --git a/buildSrc/src/main/kotlin/AdapterConfig.kt b/buildSrc/src/main/kotlin/AdapterConfig.kt
index 575071a42..d6fc3df31 100644
--- a/buildSrc/src/main/kotlin/AdapterConfig.kt
+++ b/buildSrc/src/main/kotlin/AdapterConfig.kt
@@ -5,9 +5,7 @@ import org.gradle.kotlin.dsl.dependencies
 
 // For specific version pinning, see
 // https://papermc.io/repo/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
-fun Project.applyPaperweightAdapterConfiguration(
-        paperVersion: String
-) {
+fun Project.applyPaperweightAdapterConfiguration() {
     applyCommonConfiguration()
     apply(plugin = "java-library")
     applyCommonJavaConfiguration(
@@ -17,7 +15,6 @@ fun Project.applyPaperweightAdapterConfiguration(
     apply(plugin = "io.papermc.paperweight.userdev")
 
     dependencies {
-        paperDevBundle(paperVersion)
         "implementation"(project(":worldedit-bukkit"))
     }
 
diff --git a/buildSrc/src/main/kotlin/LibsConfig.kt b/buildSrc/src/main/kotlin/LibsConfig.kt
index daf806a80..caae699d7 100644
--- a/buildSrc/src/main/kotlin/LibsConfig.kt
+++ b/buildSrc/src/main/kotlin/LibsConfig.kt
@@ -52,6 +52,7 @@ fun Project.applyLibrariesConfiguration() {
         dependencies {
             exclude(dependency("com.google.guava:guava"))
             exclude(dependency("com.google.code.gson:gson"))
+            exclude(dependency("com.google.errorprone:error_prone_annotations"))
             exclude(dependency("org.checkerframework:checker-qual"))
             exclude(dependency("org.apache.logging.log4j:log4j-api"))
             exclude(dependency("com.google.code.findbugs:jsr305"))
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 284f76861..89dc64163 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,6 +4,7 @@ include("worldedit-libs")
 
 include("worldedit-bukkit:adapters:adapter-legacy")
 include("worldedit-bukkit:adapters:adapter-1_17_1")
+include("worldedit-bukkit:adapters:adapter-1_18")
 
 listOf("bukkit", "core", "cli").forEach {
     include("worldedit-libs:$it")
diff --git a/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts
index 218701aae..7a44e517d 100644
--- a/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts
+++ b/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts
@@ -1,11 +1,19 @@
+// TODO await https://github.com/PaperMC/paperweight/issues/116
+//applyPaperweightAdapterConfiguration()
+//
+//dependencies {
+//    paperDevBundle("1.17.1-R0.1-20211120.192557-194")
+//}
+
+// Until the above issue is resolved, we are bundling old versions using their last assembled JAR.
+// Technically this means we cannot really update them, but that is is the price we pay for supporting older versions.
+
+
 plugins {
+    base
     java
 }
 
-applyPaperweightAdapterConfiguration(
-        "1.17.1-R0.1-20211120.192557-194"
-)
-
 repositories {
     maven {
         name = "PaperMC"
@@ -16,6 +24,10 @@ repositories {
     }
 }
 
+artifacts {
+    add("default", file("./src/main/resources/worldedit-adapter-1.17.1.jar"))
+}
+
 dependencies {
     compileOnly(libs.paperlib)
 }
diff --git a/worldedit-bukkit/adapters/adapter-1_17_1/src/main/resources/worldedit-adapter-1.17.1.jar b/worldedit-bukkit/adapters/adapter-1_17_1/src/main/resources/worldedit-adapter-1.17.1.jar
new file mode 100644
index 000000000..a1d408d0d
Binary files /dev/null and b/worldedit-bukkit/adapters/adapter-1_17_1/src/main/resources/worldedit-adapter-1.17.1.jar differ
diff --git a/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts
new file mode 100644
index 000000000..68d52c55a
--- /dev/null
+++ b/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    java
+}
+
+applyPaperweightAdapterConfiguration()
+
+repositories {
+    maven {
+        name = "PaperMC"
+        url = uri("https://papermc.io/repo/repository/maven-public/")
+    }
+}
+
+dependencies {
+    paperDevBundle("1.18-rc3-R0.1-SNAPSHOT")
+    compileOnly(libs.paperlib)
+}