diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index e1404cb..70d1fc6 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -1,5 +1,5 @@
 To setup NMS:
 1. Download BuildTools, move it into an empty directory and open terminal
 2. ```
-   java -jar BuildTools.jar --rev 1.21.1 --remapped
+   java -jar BuildTools.jar --rev 1.21.3 --remapped
    ```
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2758b38..f170ffb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.spigot.version>1.21.1-R0.1-SNAPSHOT</project.spigot.version>
+        <project.spigot.version>1.21.3-R0.1-SNAPSHOT</project.spigot.version>
     </properties>
 
     <build>
diff --git a/src/main/java/eu/m724/tweaks/chat/ChatListener.java b/src/main/java/eu/m724/tweaks/chat/ChatListener.java
index f114e58..1af6e47 100644
--- a/src/main/java/eu/m724/tweaks/chat/ChatListener.java
+++ b/src/main/java/eu/m724/tweaks/chat/ChatListener.java
@@ -14,8 +14,8 @@ import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.chat.TranslatableComponent;
 import net.md_5.bungee.chat.ComponentSerializer;
 import net.minecraft.network.chat.Component;
-import org.bukkit.craftbukkit.v1_21_R1.CraftRegistry;
-import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_21_R2.CraftRegistry;
+import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
diff --git a/src/main/java/eu/m724/tweaks/worldborder/WorldBorderExpanderListener.java b/src/main/java/eu/m724/tweaks/worldborder/WorldBorderExpanderListener.java
index e94051c..5e393c7 100644
--- a/src/main/java/eu/m724/tweaks/worldborder/WorldBorderExpanderListener.java
+++ b/src/main/java/eu/m724/tweaks/worldborder/WorldBorderExpanderListener.java
@@ -7,7 +7,7 @@
 package eu.m724.tweaks.worldborder;
 
 import net.minecraft.server.level.ServerLevel;
-import org.bukkit.craftbukkit.v1_21_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_21_R2.CraftWorld;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldLoadEvent;