diff --git a/patches/server/Register-spawn-egg-meta-for-1.17-mobs.patch b/patches/server/Register-spawn-egg-meta-for-1.17-mobs.patch
deleted file mode 100644
index a00844b487..0000000000
--- a/patches/server/Register-spawn-egg-meta-for-1.17-mobs.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: chickeneer <emcchickeneer@gmail.com>
-Date: Sat, 2 Oct 2021 10:14:04 -0500
-Subject: [PATCH] Register spawn egg meta for 1.17 mobs
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory {
-         case YELLOW_BANNER:
-         case YELLOW_WALL_BANNER:
-             return meta instanceof CraftMetaBanner ? meta : new CraftMetaBanner(meta);
-+        case AXOLOTL_SPAWN_EGG: // Paper
-         case BAT_SPAWN_EGG:
-         case BEE_SPAWN_EGG:
-         case BLAZE_SPAWN_EGG:
-@@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory {
-         case EVOKER_SPAWN_EGG:
-         case FOX_SPAWN_EGG:
-         case GHAST_SPAWN_EGG:
-+        case GLOW_SQUID_SPAWN_EGG: // Paper
-+        case GOAT_SPAWN_EGG: // Paper
-         case GUARDIAN_SPAWN_EGG:
-         case HOGLIN_SPAWN_EGG:
-         case HORSE_SPAWN_EGG:
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {
-             case YELLOW_BANNER:
-             case YELLOW_WALL_BANNER:
-                 return new CraftMetaBanner(item.getTag());
-+            case AXOLOTL_SPAWN_EGG: // Paper
-             case BAT_SPAWN_EGG:
-             case BEE_SPAWN_EGG:
-             case BLAZE_SPAWN_EGG:
-@@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {
-             case EVOKER_SPAWN_EGG:
-             case FOX_SPAWN_EGG:
-             case GHAST_SPAWN_EGG:
-+            case GLOW_SQUID_SPAWN_EGG: // Paper
-+            case GOAT_SPAWN_EGG: // Paper
-             case GUARDIAN_SPAWN_EGG:
-             case HOGLIN_SPAWN_EGG:
-             case HORSE_SPAWN_EGG:
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java
-@@ -0,0 +0,0 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta {
-     @Override
-     boolean applicableTo(Material type) {
-         switch (type) {
-+            case AXOLOTL_SPAWN_EGG: // Paper
-             case BAT_SPAWN_EGG:
-             case BEE_SPAWN_EGG:
-             case BLAZE_SPAWN_EGG:
-@@ -0,0 +0,0 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta {
-             case EVOKER_SPAWN_EGG:
-             case FOX_SPAWN_EGG:
-             case GHAST_SPAWN_EGG:
-+            case GLOW_SQUID_SPAWN_EGG: // Paper
-+            case GOAT_SPAWN_EGG: // Paper
-             case GUARDIAN_SPAWN_EGG:
-             case HOGLIN_SPAWN_EGG:
-             case HORSE_SPAWN_EGG:
diff --git a/work/Bukkit b/work/Bukkit
index 58c2d3c7b8..9b45fa2fab 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 58c2d3c7b845e2db9476e5e76e4b7f7d376f05e8
+Subproject commit 9b45fa2fab08e654962ed0ca5f85f6d22bea40c2
diff --git a/work/CraftBukkit b/work/CraftBukkit
index fd50041d32..cef1fda37b 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit fd50041d32495444c229c63a6adf691c93b135e1
+Subproject commit cef1fda37b872df7f6c2f401c669a78fd2de5d70