diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index f0f8bf4b2..71895e12c 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -31,7 +31,7 @@ dependencies {
     implementation(gradleApi())
     implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
     implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.1")
-    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.2")
+    implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.3.3")
 }
 
 kotlin {
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 d9c2fcc45..0aa31cc0b 100644
--- a/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts
+++ b/worldedit-bukkit/adapters/adapter-1_17_1/build.gradle.kts
@@ -1,16 +1,6 @@
-// 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.
-
+applyPaperweightAdapterConfiguration()
 
 plugins {
-    base
     java
 }
 
@@ -20,25 +10,6 @@ repositories {
         name = "PaperMC"
         url = uri("https://papermc.io/repo/repository/maven-public/")
     }
-    maven {
-        name = "Athion"
-        url = uri("https://ci.athion.net/plugin/repository/tools/")
-        content {
-            includeModule("io.papermc", "paper-server")
-        }
-    }
-    maven {
-        name = "OSS Sonatype Snapshots"
-        url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-    }
-    maven {
-        name = "Mojang"
-        url = uri("https://libraries.minecraft.net/")
-    }
-}
-
-artifacts {
-    add("default", file("./src/main/resources/worldedit-adapter-1.17.1.jar"))
 }
 
 java {
@@ -51,13 +22,6 @@ configurations.all {
 
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT")
-    compileOnly(project(":worldedit-bukkit"))
-    compileOnly(project(":worldedit-core"))
-    compileOnly("io.papermc:paper-server:1_17_r1_2")
+    paperDevBundle("1.17.1-R0.1-20211219.175449-201")
     compileOnly(libs.paperlib)
-    compileOnly("com.mojang:datafixerupper:4.0.26")
-    compileOnly("com.mojang:authlib:2.3.31")
-    compileOnly("com.mojang:brigadier:1.0.18")
-    compileOnly("io.netty:netty-all:4.1.25.Final")
 }
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
deleted file mode 100644
index a1d408d0d..000000000
Binary files a/worldedit-bukkit/adapters/adapter-1_17_1/src/main/resources/worldedit-adapter-1.17.1.jar and /dev/null differ
diff --git a/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts b/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts
index 241ab7d14..e3658659c 100644
--- a/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts
+++ b/worldedit-bukkit/adapters/adapter-1_18/build.gradle.kts
@@ -12,6 +12,6 @@ repositories {
 }
 
 dependencies {
-    paperDevBundle("1.18.1-R0.1-20211218.091106-15")
+    paperDevBundle("1.18.1-R0.1-20211221.093324-19")
     compileOnly(libs.paperlib)
 }