diff --git a/build.gradle.kts b/build.gradle.kts
index 081bcecce..ef1ae173c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,12 +1,12 @@
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "7.0.0" apply false
-    id("io.papermc.paperweight.patcher") version "1.0.0-SNAPSHOT"
+    id("io.papermc.paperweight.patcher") version "1.0.0"
 }
 
 repositories {
     mavenCentral()
-    maven("https://wav.jfrog.io/artifactory/repo/") {
+    maven("https://papermc.io/repo/repository/maven-public/") {
         content {
             onlyForConfigurations("paperclip")
         }
@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     remapper("org.quiltmc:tiny-remapper:0.4.1")
-    paperclip("io.papermc:paperclip:2.0.0-SNAPSHOT@jar")
+    paperclip("io.papermc:paperclip:2.0.0@jar")
 }
 
 subprojects {
diff --git a/gradle.properties b/gradle.properties
index a8257fbd9..d4e66219e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,7 @@
 group=net.pl3x.purpur
 version=1.17-R0.1-SNAPSHOT
 packageVersion=1_17_R1
-paperCommit=b7cdb5d6c4dc166497c84cbabd8e550c058c8a3b
+paperCommit=df2247b2ed5022561a0465da9b3c7a28a861ab87
 
+org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx3G
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf51..69a971507 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/patches/api/0001-Build-System-Changes.patch b/patches/api/0001-Build-System-Changes.patch
index 86e6d20e2..db168b559 100644
--- a/patches/api/0001-Build-System-Changes.patch
+++ b/patches/api/0001-Build-System-Changes.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Build System Changes
 todo: merge with rebrand patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 12c4f278d52bd6fb626fc7cd9414e8869c49fcd2..e2399c47459f5a7b874084c95e8995893efb75a1 100644
+index 6d04816e22f44a33c001d2b7e080402fba6af86c..d63d357d1357bfb8ffae09cb7ba0cd361f09f4e5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -26,6 +26,7 @@ dependencies {
+@@ -27,6 +27,7 @@ dependencies {
      api("org.ow2.asm:asm:9.0")
      api("org.ow2.asm:asm-commons:9.0")
      api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
diff --git a/patches/server/0001-Build-System-Changes.patch b/patches/server/0001-Build-System-Changes.patch
index bba118835..0a7afd93e 100644
--- a/patches/server/0001-Build-System-Changes.patch
+++ b/patches/server/0001-Build-System-Changes.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Build System Changes
 todo: merge with rebrand patch
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 5c885454c729467e29fd3784058fff6a7379c9dc..eeefb573a73d27ce850f5303be86aae7c4897fe6 100644
+index f9d93a70ac754150b6e545c70b3071632be8f294..79b0248caa2bcce0d3574a06877bd7e2213b443c 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -20,8 +20,8 @@ repositories {
@@ -20,7 +20,7 @@ index 5c885454c729467e29fd3784058fff6a7379c9dc..eeefb573a73d27ce850f5303be86aae7
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.12.1")
      implementation("net.minecrell:terminalconsoleappender:1.2.0")
-@@ -51,6 +51,7 @@ dependencies {
+@@ -52,6 +52,7 @@ dependencies {
  
      implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
      implementation("io.netty:netty-all:4.1.65.Final") // Paper
@@ -28,7 +28,7 @@ index 5c885454c729467e29fd3784058fff6a7379c9dc..eeefb573a73d27ce850f5303be86aae7
  
      testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
      testImplementation("junit:junit:4.13.1")
-@@ -65,7 +66,7 @@ tasks.jar {
+@@ -66,7 +67,7 @@ tasks.jar {
          attributes(mapOf(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -37,7 +37,7 @@ index 5c885454c729467e29fd3784058fff6a7379c9dc..eeefb573a73d27ce850f5303be86aae7
              "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -100,7 +101,7 @@ tasks.test {
+@@ -119,7 +120,7 @@ tasks.test {
  
  fun TaskContainer.registerRunTask(name: String, block: JavaExec.() -> Unit): TaskProvider<JavaExec> =
      register<JavaExec>(name) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 146730d92..babdf4736 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1,7 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven("https://wav.jfrog.io/artifactory/repo/")
+        maven("https://papermc.io/repo/repository/maven-public/")
     }
 }