diff --git a/build.gradle.kts b/build.gradle.kts
index 6b3e943f..b977c4a9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,12 +15,5 @@ allprojects {
         maven("https://repo.papermc.io/repository/maven-public/")
         maven("https://repo.fancyinnovations.com/releases")
         maven(url = "https://jitpack.io")
-        maven("https://maven-prs.papermc.io/Paper/pr13194") {
-            name = "Maven for PR #13194" // https://github.com/PaperMC/Paper/pull/13194
-            mavenContent {
-                includeModule("io.papermc.paper", "dev-bundle")
-                includeModule("io.papermc.paper", "paper-api")
-            }
-        }
     }
 }
diff --git a/plugins/fancynpcs/VERSION b/plugins/fancynpcs/VERSION
index 96d77177..3db63d06 100644
--- a/plugins/fancynpcs/VERSION
+++ b/plugins/fancynpcs/VERSION
@@ -1 +1 @@
-2.8.1
\ No newline at end of file
+2.8.1.313
\ No newline at end of file
diff --git a/plugins/fancynpcs/build.gradle.kts b/plugins/fancynpcs/build.gradle.kts
index 8ef01630..db825c06 100644
--- a/plugins/fancynpcs/build.gradle.kts
+++ b/plugins/fancynpcs/build.gradle.kts
@@ -95,7 +95,7 @@ paper {
 
 tasks {
     runServer {
-        minecraftVersion("1.21.10")
+        minecraftVersion("1.21.11-pre3")
 
         downloadPlugins {
 //            hangar("ViaVersion", "5.4.0")
diff --git a/plugins/fancynpcs/snapshot_deployment_config.json b/plugins/fancynpcs/snapshot_deployment_config.json
index 3bd00c0d..ab3d99d9 100644
--- a/plugins/fancynpcs/snapshot_deployment_config.json
+++ b/plugins/fancynpcs/snapshot_deployment_config.json
@@ -22,7 +22,8 @@
     "1.21.7",
     "1.21.8",
     "1.21.9",
-    "1.21.10"
+    "1.21.10",
+    "1.21.11-pre3"
   ],
   "channel": "BETA",
   "loaders": [
diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java
index 6878dce4..f55ee221 100644
--- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java
+++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/AttributeManagerImpl.java
@@ -31,7 +31,7 @@ public class AttributeManagerImpl implements AttributeManager {
     private void init() {
         String mcVersion = Bukkit.getMinecraftVersion();
         switch (mcVersion) {
-            case "1.21.11" -> attributes = Attributes_1_21_11.getAllAttributes();
+            case "1.21.11 Pre-Release 3" -> attributes = Attributes_1_21_11.getAllAttributes();
             case "1.21.9", "1.21.10" -> attributes = Attributes_1_21_9.getAllAttributes();
             case "1.21.6", "1.21.7", "1.21.8" -> attributes = Attributes_1_21_6.getAllAttributes();
             case "1.21.5" -> attributes = Attributes_1_21_5.getAllAttributes();
diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
index 2afc3707..13c60323 100644
--- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
+++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
@@ -164,7 +164,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin {
         String mcVersion = Bukkit.getMinecraftVersion();
 
         switch (mcVersion) {
-            case "1.21.11" -> npcAdapter = Npc_1_21_11::new;
+            case "1.21.11 Pre-Release 3" -> npcAdapter = Npc_1_21_11::new;
             case "1.21.9", "1.21.10" -> npcAdapter = Npc_1_21_9::new;
             case "1.21.6", "1.21.7", "1.21.8" -> npcAdapter = Npc_1_21_6::new;
             case "1.21.5" -> npcAdapter = Npc_1_21_5::new;
@@ -277,7 +277,7 @@ public class FancyNpcs extends JavaPlugin implements FancyNpcsPlugin {
         pluginManager.registerEvents(new PlayerTeleportListener(), instance);
         pluginManager.registerEvents(new PlayerChangedWorldListener(), instance);
         pluginManager.registerEvents(skinManager, instance);
-        if (Set.of("1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11").contains(Bukkit.getMinecraftVersion())) {
+        if (Set.of("1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11 Pre-Release 3").contains(Bukkit.getMinecraftVersion())) {
             getServer().getPluginManager().registerEvents(new PlayerLoadedListener(), this);
         }
 
diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java
index a439876a..5fad6bef 100644
--- a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java
+++ b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/commands/CloudCommandManager.java
@@ -33,8 +33,8 @@ import org.incendo.cloud.parser.standard.EnumParser;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Set;
 import java.util.Optional;
+import java.util.Set;
 
 import static org.incendo.cloud.exception.handling.ExceptionHandler.unwrappingHandler;
 
@@ -199,7 +199,7 @@ public final class CloudCommandManager {
             annotationParser.parse(FancyNpcsDebugCMD.INSTANCE);
         }
 
-        if (Set.of("1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11").contains(Bukkit.getMinecraftVersion())) {
+        if (Set.of("1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11 Pre-Release 3").contains(Bukkit.getMinecraftVersion())) {
             annotationParser.parse(ScaleCMD.INSTANCE);
         }