diff --git a/hCore-bukkit/api/build.gradle b/hCore-bukkit/api/build.gradle
index 44de613c..003697db 100644
--- a/hCore-bukkit/api/build.gradle
+++ b/hCore-bukkit/api/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
 }
 
 publishing {
diff --git a/hCore-bukkit/nms/v1_10_R1/build.gradle b/hCore-bukkit/nms/v1_10_R1/build.gradle
index 62f1b5ec..b5983f38 100644
--- a/hCore-bukkit/nms/v1_10_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_10_R1/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.10.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_11_R1/build.gradle b/hCore-bukkit/nms/v1_11_R1/build.gradle
index 20232c98..b5983f38 100644
--- a/hCore-bukkit/nms/v1_11_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_11_R1/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.11-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_12_R1/build.gradle b/hCore-bukkit/nms/v1_12_R1/build.gradle
index e9bf2356..b5983f38 100644
--- a/hCore-bukkit/nms/v1_12_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_12_R1/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.12.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_13_R1/build.gradle b/hCore-bukkit/nms/v1_13_R1/build.gradle
index 65f2de90..b5983f38 100644
--- a/hCore-bukkit/nms/v1_13_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_13_R1/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.13-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_13_R2/build.gradle b/hCore-bukkit/nms/v1_13_R2/build.gradle
index 31464fdb..b5983f38 100644
--- a/hCore-bukkit/nms/v1_13_R2/build.gradle
+++ b/hCore-bukkit/nms/v1_13_R2/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.13.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_14_R1/build.gradle b/hCore-bukkit/nms/v1_14_R1/build.gradle
index 7a0c1073..b5983f38 100644
--- a/hCore-bukkit/nms/v1_14_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_14_R1/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.14.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_15_R1/build.gradle b/hCore-bukkit/nms/v1_15_R1/build.gradle
index 30d542f6..b5983f38 100644
--- a/hCore-bukkit/nms/v1_15_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_15_R1/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.15-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_16_R1/build.gradle b/hCore-bukkit/nms/v1_16_R1/build.gradle
index 21d8353c..b5983f38 100644
--- a/hCore-bukkit/nms/v1_16_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_16_R1/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.16.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_16_R2/build.gradle b/hCore-bukkit/nms/v1_16_R2/build.gradle
index 70d15dc4..b5983f38 100644
--- a/hCore-bukkit/nms/v1_16_R2/build.gradle
+++ b/hCore-bukkit/nms/v1_16_R2/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.16.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_16_R3/build.gradle b/hCore-bukkit/nms/v1_16_R3/build.gradle
index b5da8341..b5983f38 100644
--- a/hCore-bukkit/nms/v1_16_R3/build.gradle
+++ b/hCore-bukkit/nms/v1_16_R3/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_17_R1/build.gradle b/hCore-bukkit/nms/v1_17_R1/build.gradle
index 7a1f944d..0ddb6ca0 100644
--- a/hCore-bukkit/nms/v1_17_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_17_R1/build.gradle
@@ -1,7 +1,7 @@
 sourceCompatibility = 16
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.17.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_18_R1/build.gradle b/hCore-bukkit/nms/v1_18_R1/build.gradle
index f0360e29..a46e7e11 100644
--- a/hCore-bukkit/nms/v1_18_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_18_R1/build.gradle
@@ -2,7 +2,7 @@ sourceCompatibility = 17
 
 dependencies {
     compileOnly 'com.mojang:authlib:3.2.28'
-    compileOnly 'org.spigotmc:spigot:1.18-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_18_R2/build.gradle b/hCore-bukkit/nms/v1_18_R2/build.gradle
index 66b90368..a46e7e11 100644
--- a/hCore-bukkit/nms/v1_18_R2/build.gradle
+++ b/hCore-bukkit/nms/v1_18_R2/build.gradle
@@ -2,7 +2,7 @@ sourceCompatibility = 17
 
 dependencies {
     compileOnly 'com.mojang:authlib:3.2.28'
-    compileOnly 'org.spigotmc:spigot:1.18.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_19_1_R1/build.gradle b/hCore-bukkit/nms/v1_19_1_R1/build.gradle
index 0ec1538a..a46e7e11 100644
--- a/hCore-bukkit/nms/v1_19_1_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_19_1_R1/build.gradle
@@ -2,7 +2,7 @@ sourceCompatibility = 17
 
 dependencies {
     compileOnly 'com.mojang:authlib:3.2.28'
-    compileOnly 'org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_19_R1/build.gradle b/hCore-bukkit/nms/v1_19_R1/build.gradle
index b8a9f91f..a46e7e11 100644
--- a/hCore-bukkit/nms/v1_19_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_19_R1/build.gradle
@@ -2,7 +2,7 @@ sourceCompatibility = 17
 
 dependencies {
     compileOnly 'com.mojang:authlib:3.2.28'
-    compileOnly 'org.spigotmc:spigot:1.19-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_19_R2/build.gradle b/hCore-bukkit/nms/v1_19_R2/build.gradle
index 1bb61337..a46e7e11 100644
--- a/hCore-bukkit/nms/v1_19_R2/build.gradle
+++ b/hCore-bukkit/nms/v1_19_R2/build.gradle
@@ -2,7 +2,7 @@ sourceCompatibility = 17
 
 dependencies {
     compileOnly 'com.mojang:authlib:3.2.28'
-    compileOnly 'org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_19_R3/build.gradle b/hCore-bukkit/nms/v1_19_R3/build.gradle
index 62c99e06..a46e7e11 100644
--- a/hCore-bukkit/nms/v1_19_R3/build.gradle
+++ b/hCore-bukkit/nms/v1_19_R3/build.gradle
@@ -2,7 +2,7 @@ sourceCompatibility = 17
 
 dependencies {
     compileOnly 'com.mojang:authlib:3.2.28'
-    compileOnly 'org.spigotmc:spigot:1.19.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_20_R1/build.gradle b/hCore-bukkit/nms/v1_20_R1/build.gradle
index 7ec2f77c..a46e7e11 100644
--- a/hCore-bukkit/nms/v1_20_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_20_R1/build.gradle
@@ -2,7 +2,7 @@ sourceCompatibility = 17
 
 dependencies {
     compileOnly 'com.mojang:authlib:3.2.28'
-    compileOnly 'org.spigotmc:spigot:1.20.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_20_R2/build.gradle b/hCore-bukkit/nms/v1_20_R2/build.gradle
index a148e789..a46e7e11 100644
--- a/hCore-bukkit/nms/v1_20_R2/build.gradle
+++ b/hCore-bukkit/nms/v1_20_R2/build.gradle
@@ -2,7 +2,7 @@ sourceCompatibility = 17
 
 dependencies {
     compileOnly 'com.mojang:authlib:3.2.28'
-    compileOnly 'org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_20_R3/build.gradle b/hCore-bukkit/nms/v1_20_R3/build.gradle
index 19b53c34..a46e7e11 100644
--- a/hCore-bukkit/nms/v1_20_R3/build.gradle
+++ b/hCore-bukkit/nms/v1_20_R3/build.gradle
@@ -2,7 +2,7 @@ sourceCompatibility = 17
 
 dependencies {
     compileOnly 'com.mojang:authlib:3.2.28'
-    compileOnly 'org.spigotmc:spigot:1.20.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_8_R3/build.gradle b/hCore-bukkit/nms/v1_8_R3/build.gradle
index 644fa7ba..b5983f38 100644
--- a/hCore-bukkit/nms/v1_8_R3/build.gradle
+++ b/hCore-bukkit/nms/v1_8_R3/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.8.8-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_9_R1/build.gradle b/hCore-bukkit/nms/v1_9_R1/build.gradle
index 039fc742..b5983f38 100644
--- a/hCore-bukkit/nms/v1_9_R1/build.gradle
+++ b/hCore-bukkit/nms/v1_9_R1/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.9-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/nms/v1_9_R2/build.gradle b/hCore-bukkit/nms/v1_9_R2/build.gradle
index 61e9792e..13b4f62a 100644
--- a/hCore-bukkit/nms/v1_9_R2/build.gradle
+++ b/hCore-bukkit/nms/v1_9_R2/build.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.9.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 
diff --git a/hCore-bukkit/plugin/build.gradle b/hCore-bukkit/plugin/build.gradle
index 391e98fd..ca09731b 100644
--- a/hCore-bukkit/plugin/build.gradle
+++ b/hCore-bukkit/plugin/build.gradle
@@ -3,7 +3,7 @@ dependencies {
     implementation project(':hCore-bukkit:api')
     annotationProcessor project(':hCore-bukkit:api')
 
-    compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.21.3-R0.1-SNAPSHOT'
 }
 
 tasks.compileJava.dependsOn(