diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d6265c702..575b3a28d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,20 +5,20 @@ jobs:
     strategy:
       matrix:
         java: [17-jdk, 21-jdk]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
       image: eclipse-temurin:${{ matrix.java }}
       options: --user root
     steps:
       - uses: actions/checkout@v4
       - run: ./gradlew build publishToMavenLocal --stacktrace --warning-mode fail
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
-          name: Artifacts
+          name: Artifacts ${{ matrix.java }}
           path: build/libs/
 
   client_test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -26,12 +26,12 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'microsoft'
-          java-version: '17'
+          java-version: '21'
       - name: Run Auto test Client
         uses: modmuss50/xvfb-action@v1
         with:
           run: ./gradlew :minecraft:minecraft-test:runProductionAutoTestClient --stacktrace --warning-mode=fail
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: Client Test Screenshots
diff --git a/.github/workflows/manage_issues.yml b/.github/workflows/manage_issues.yml
index db534ff59..b72767a52 100644
--- a/.github/workflows/manage_issues.yml
+++ b/.github/workflows/manage_issues.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   labels:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: FabricMC/fabric-action-scripts@v2
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 39c925f6c..f12d2583f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,9 +6,9 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: eclipse-temurin:17-jdk
+      image: eclipse-temurin:21-jdk
       options: --user root
     steps:
       - run: apt update && apt install git -y && git --version
diff --git a/build.gradle b/build.gradle
index ec65db5d0..1eb1efce4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ import org.slf4j.LoggerFactory
 buildscript {
 	dependencies {
 		classpath 'org.kohsuke:github-api:1.135'
-		classpath 'com.guardsquare:proguard-gradle:' + (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_11) ? '7.4.0-beta02' : '7.1.0')
+		classpath 'com.guardsquare:proguard-gradle:7.5.0'
 	}
 }
 
@@ -15,8 +15,8 @@ plugins {
 	id 'maven-publish'
 	id 'checkstyle'
 	id 'com.diffplug.spotless' version "6.22.0"
-	id 'fabric-loom' version '1.4-SNAPSHOT' apply false
-	id 'com.github.johnrengelman.shadow' version '8.1.1'
+	id 'fabric-loom' version '1.7-SNAPSHOT' apply false
+	id 'io.github.goooler.shadow' version '8.1.8'
 	id 'me.modmuss50.remotesign' version "0.4.0"
 }
 
@@ -113,7 +113,7 @@ dependencies {
 	include 'org.ow2.sat4j:org.ow2.sat4j.pb:2.3.6'
 	include "net.fabricmc:tiny-remapper:0.10.1"
 	include "net.fabricmc:access-widener:2.1.0"
-	include ('net.fabricmc:mapping-io:0.5.0') {
+	include ('net.fabricmc:mapping-io:0.6.1') {
 		// Mapping-io depends on ASM, dont bundle
 		transitive = false
 	}
@@ -123,10 +123,10 @@ dependencies {
 	testCompileOnly 'org.jetbrains:annotations:23.0.0'
 
 	// Unit testing for mod metadata
-	testImplementation('org.junit.jupiter:junit-jupiter:5.9.2')
+	testImplementation('org.junit.jupiter:junit-jupiter:5.10.3')
 	testRuntimeOnly('org.junit.platform:junit-platform-launcher')
 
-	testImplementation("org.mockito:mockito-core:5.10.0")
+	testImplementation("org.mockito:mockito-core:5.12.0")
 }
 
 apply from: rootProject.file('gradle/installer-json.gradle')
@@ -233,7 +233,10 @@ task proguardJar(type: ProGuardTask, dependsOn: fatJar) {
 		}
 	}
 
-	libraryjars JavaVersion.current().java9Compatible ? "${System.getProperty('java.home')}/jmods" : "${System.getProperty('java.home')}/lib/rt.jar"
+	def java8 = javaToolchains.launcherFor {
+		languageVersion = JavaLanguageVersion.of(8)
+	}.get()
+	libraryjars java8.metadata.installationPath.file("jre/lib/rt.jar")
 
 	injars fatJar.archiveFile
 	outjars proguardFile
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac72c34e8..a4413138c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/junit/build.gradle b/junit/build.gradle
index 656f23456..38b927585 100644
--- a/junit/build.gradle
+++ b/junit/build.gradle
@@ -18,7 +18,7 @@ repositories {
 dependencies {
 	api project(":")
 
-	api platform("org.junit:junit-bom:5.10.0")
+	api platform("org.junit:junit-bom:5.10.3")
 	api "org.junit.jupiter:junit-jupiter-engine"
 	implementation "org.junit.platform:junit-platform-launcher"
 }