diff --git a/.github/dependencies.sha256 b/.github/dependencies.sha256
index b046e2f..7dc30ec 100644
--- a/.github/dependencies.sha256
+++ b/.github/dependencies.sha256
@@ -4,5 +4,4 @@
 d52cc0c734a9bb942428a403bb3630123596bcd9c94d3a77ea2782046b113af5  libs/MMOCore-1.11.3.jar
 c84700df5942fd969d3e8c2f1ad2c3ebeb17987ef88b426408d1306e49c4aada  libs/MMOItems-6.10.jar
 660ff2a6ec86bc8d7779948cf65c1637e271a16e1ef812d6a273f4a5c5eec73c  libs/MythicLib-1.7.jar
-97e0c708c1e319189ce1cda049244551a105860d51e908d2bcbc183fd1f89816  libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar
 575aa30aee8ef723ad36229eb6c4223bca6e4037d271ddccc8f23cf6faa69747  libs/MythicMobs-5.8.0-SNAPSHOT.jar
diff --git a/.github/scripts/prepare-release.sh b/.github/scripts/prepare-release.sh
index 5b6f974..95503b5 100644
--- a/.github/scripts/prepare-release.sh
+++ b/.github/scripts/prepare-release.sh
@@ -9,6 +9,5 @@ curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer
 curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/d52cc0c734a9/MMOCore-1.11.3.jar?ref=$ref" > "libs/MMOCore-1.11.3.jar"
 curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/c84700df5942/MMOItems-6.10.jar?ref=$ref" > "libs/MMOItems-6.10.jar"
 curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/660ff2a6ec86/MythicLib-1.7.jar?ref=$ref" > "libs/MythicLib-1.7.jar"
-curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/97e0c708c1e3/spigot-api-1.20.2-R0.1-SNAPSHOT.jar?ref=$ref" > "libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar"
 curl --fail --location --silent --show-error --retry 3 -H "Authorization: Bearer $GH_TOKEN" -H "Accept: application/vnd.github.raw+json" "https://api.github.com/repos/TF-Minecraft/ServerAssets/contents/jars/575aa30aee8e/MythicMobs-5.8.0-SNAPSHOT.jar?ref=$ref" > "libs/MythicMobs-5.8.0-SNAPSHOT.jar"
 sha256sum --check .github/dependencies.sha256
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 66b7bea..1a7a55c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-java@v6
         with:
           distribution: temurin
-          java-version: '25'
+          java-version: '21'
       - name: Prepare pinned dependencies
         env:
           GH_TOKEN: ${{ secrets.DEPS_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ac4861b..7cf19d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,7 @@ jobs:
       contents: write
     uses: ./.github/workflows/maven-release.yml
     with:
-      java-version: '25'
+      java-version: '21'
       # Exact path, not a glob. {version} is replaced with the tag without v.
       artifact-path: target/advancedresearch-{version}.jar
     secrets:
diff --git a/pom.xml b/pom.xml
index 593721d..93696bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,10 +9,16 @@
     <version>1.2.2</version>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>21</maven.compiler.release>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>spigot-snapshots</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>local</groupId>
@@ -57,11 +63,10 @@
             <systemPath>${project.basedir}/libs/MythicLib-1.7.jar</systemPath>
         </dependency>
         <dependency>
-            <groupId>local</groupId>
+            <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20.2-R0.1-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/libs/spigot-api-1.20.2-R0.1-SNAPSHOT.jar</systemPath>
+            <version>1.21.10-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
             <dependency>
             <groupId>local</groupId>
@@ -86,6 +91,11 @@
             </resource>
         </resources>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.14.1</version>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 8574936..26b34cc 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 main: me.Plugins.AdvancedResearch.ResearchMain
-api-version: 1.19
+api-version: '1.21.10'
 name: AdvancedResearch
 version: ${project.version}
 author: Drefvelin