diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3121ffa58..218c6d23a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '21'
       - name: 💼 Load Gradle Cache
         uses: actions/cache@v4
         with:
diff --git a/Plan/build.gradle b/Plan/build.gradle
index be3d962af..0e4bc1735 100644
--- a/Plan/build.gradle
+++ b/Plan/build.gradle
@@ -17,7 +17,7 @@ plugins {
     id "jacoco"
     id "checkstyle"
     id "org.sonarqube" version "5.0.0.4638"
-    id 'fabric-loom' version '1.3-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.6-SNAPSHOT' apply false
 }
 
 apply plugin: 'nebula-aggregate-javadocs'
diff --git a/Plan/fabric/build.gradle b/Plan/fabric/build.gradle
index 9e56c5178..eff2d3151 100644
--- a/Plan/fabric/build.gradle
+++ b/Plan/fabric/build.gradle
@@ -8,10 +8,10 @@ dependencies {
 
     shadow "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
 
-    minecraft "com.mojang:minecraft:1.20.4"
-    mappings "net.fabricmc:yarn:1.20.4+build.3:v2"
-    modImplementation "net.fabricmc:fabric-loader:0.15.2"
-    modImplementation('me.lucko:fabric-permissions-api:0.3-SNAPSHOT')
+    minecraft "com.mojang:minecraft:1.20.5-rc2"
+    mappings "net.fabricmc:yarn:1.20.5-rc2+build.1:v2"
+    modImplementation "net.fabricmc:fabric-loader:0.15.10"
+    modImplementation('me.lucko:fabric-permissions-api:0.3.1')
 
     // Fabric API
     Set<String> apiModules = [
@@ -24,7 +24,7 @@ dependencies {
     ]
 
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, "0.91.2+1.20.4"))
+        modImplementation(fabricApi.module(it, "0.97.3+1.20.5"))
     }
 
     testImplementation project(path: ":common", configuration: 'testArtifacts')
@@ -36,7 +36,7 @@ loom {
 }
 
 tasks.withType(JavaCompile).configureEach {
-    options.release.set(17)
+    options.release.set(21)
 }
 
 processResources {
diff --git a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/mixin/ClientToServerHandshakePacketMixin.java b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/mixin/ClientToServerHandshakePacketMixin.java
index bac17d5bd..1ff1950a4 100644
--- a/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/mixin/ClientToServerHandshakePacketMixin.java
+++ b/Plan/fabric/src/main/java/net/playeranalytics/plan/gathering/listeners/events/mixin/ClientToServerHandshakePacketMixin.java
@@ -27,7 +27,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(ServerHandshakeNetworkHandler.class)
 public class ClientToServerHandshakePacketMixin {
 
-    @Inject(method = "onHandshake", at = @At(value = "INVOKE", ordinal = 0, target = "Lnet/minecraft/network/ClientConnection;setPacketListener(Lnet/minecraft/network/listener/PacketListener;)V"))
+    @Inject(method = "onHandshake", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerHandshakeNetworkHandler;login(Lnet/minecraft/network/packet/c2s/handshake/HandshakeC2SPacket;Z)V"))
     public void onClientHandshakeFromNetwork(HandshakeC2SPacket packet, CallbackInfo ci) {
         PlanFabricEvents.ON_HANDSHAKE.invoker().onHandshake(packet);
     }
diff --git a/Plan/fabric/src/main/resources/fabric.mod.json b/Plan/fabric/src/main/resources/fabric.mod.json
index 34199173b..9408cfb00 100644
--- a/Plan/fabric/src/main/resources/fabric.mod.json
+++ b/Plan/fabric/src/main/resources/fabric.mod.json
@@ -13,7 +13,7 @@
     "plan.mixins.json"
   ],
   "depends": {
-    "minecraft": ">=1.19",
+    "minecraft": ">=1.20.5",
     "java": ">=17",
     "fabric-api-base": "*",
     "fabric-command-api-v2": "*",
diff --git a/Plan/gradle/wrapper/gradle-wrapper.properties b/Plan/gradle/wrapper/gradle-wrapper.properties
index ac72c34e8..b82aa23a4 100644
--- a/Plan/gradle/wrapper/gradle-wrapper.properties
+++ b/Plan/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME