diff --git a/.github/workflows/generic.github_release.yml b/.github/workflows/generic.github_release.yml
index 423c868c..a2d2b358 100644
--- a/.github/workflows/generic.github_release.yml
+++ b/.github/workflows/generic.github_release.yml
@@ -49,7 +49,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'adopt'
           cache: gradle
 
diff --git a/.github/workflows/generic.test.yml b/.github/workflows/generic.test.yml
index bad15131..9aab8ad2 100644
--- a/.github/workflows/generic.test.yml
+++ b/.github/workflows/generic.test.yml
@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
           cache: gradle
 
diff --git a/build.gradle b/build.gradle
index 419bb06d..54d523c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,19 +1,31 @@
 import org.apache.tools.ant.filters.ReplaceTokens
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id 'java-library'
     id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
-    id "org.jetbrains.kotlin.jvm" version "1.8.10"
+    id "org.jetbrains.kotlin.jvm" version "2.0.21"
 }
 
 version = System.getenv('GITHUB_VERSION') ?: 'local'
 group = 'org.mvplugins.multiverse.core'
 description = 'Multiverse-Core'
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+compileJava {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+compileTestJava {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+compileTestKotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+        javaParameters.set(true)
     }
 }
 
@@ -121,8 +133,8 @@ dependencies {
     shadowed 'io.papermc:paperlib:1.0.8'
 
     // Tests
-    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10'
-    testImplementation 'com.github.seeseemelk:MockBukkit-v1.20:3.20.2'
+    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21'
+    testImplementation 'com.github.seeseemelk:MockBukkit-v1.21:3.133.0'
     testImplementation('com.googlecode.json-simple:json-simple:1.1.1') {
         exclude group: 'junit', module: 'junit'
     }
@@ -299,7 +311,7 @@ shadowJar {
 
     configurations = [project.configurations.shadowed]
 
-    archiveFileName = "$baseName-$version.$extension"
+    archiveFileName = "$archiveBaseName-$archiveVersion.$archiveExtension"
 
     dependencies {
         exclude(dependency {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c..5c40527d 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-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists