diff --git a/Spigot-Server-Patches/handle-PacketPlayInKeepAlive-async-and-revert-keepal.patch b/Spigot-Server-Patches/handle-PacketPlayInKeepAlive-async-and-revert-keepal.patch
index d060219773..0ba77668a9 100644
--- a/Spigot-Server-Patches/handle-PacketPlayInKeepAlive-async-and-revert-keepal.patch
+++ b/Spigot-Server-Patches/handle-PacketPlayInKeepAlive-async-and-revert-keepal.patch
@@ -16,14 +16,15 @@ this solves a read timeout in scenarios where the client isn't sending data to
 the server, e.g. spectating an entity.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 36af72387..b0ed57ba1 100644
+index 69ed84af9..b18bf4245 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+ 
          this.minecraftServer.methodProfiler.a("keepAlive");
          long i = this.d();
- 
--        if (i - this.f >= 30000L) { // CraftBukkit
+-
+-        if (i - this.f >= 25000L) { // CraftBukkit
 +        if (i - this.f >= 15000L) { // CraftBukkit // Paper - revert to 15
              if (this.g) {
                  this.disconnect(new ChatMessage("disconnect.timeout", new Object[0]));
diff --git a/work/Bukkit b/work/Bukkit
index 4f16bdbabb..dcc4266e33 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 4f16bdbabbad82b6130b19bcc0a4621dee83e86e
+Subproject commit dcc4266e331ab53697ba0f56dc3027d2d691cf88
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f8500c0a3e..9ab758c7b6 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f8500c0a3ea5ecbefa9f8556a480e7fe4247ddbb
+Subproject commit 9ab758c7b608854ec658450227c2a17e51845de5