diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch
index ab783d3c1..b37793550 100644
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -12,11 +12,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
--        <groupId>org.spigotmc</groupId>
--        <artifactId>spigot-parent</artifactId>
+-        <groupId>org.sonatype.oss</groupId>
+-        <artifactId>oss-parent</artifactId>
+-        <version>9</version>
 +        <groupId>com.destroystokyo.paper</groupId>
 +        <artifactId>paper-parent</artifactId>
-         <version>dev-SNAPSHOT</version>
++        <version>dev-SNAPSHOT</version>
      </parent>
  
 -    <groupId>org.spigotmc</groupId>
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 78434e891..d884ab38d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 78434e8910379dc42d0c9f439d815a6f40eaf2c8
+Subproject commit d884ab38d82eeab912a9cf866b5b704e60702679
diff --git a/work/Spigot b/work/Spigot
index f972b368d..e6f93f4ee 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit f972b368da8f4aa32dea47c27c5ac428b37f70d3
+Subproject commit e6f93f4eed1696907104cb95c00a6f6c035c82f2