diff --git a/bukkit-legacy/loader/build.gradle b/bukkit-legacy/loader/build.gradle
index a02a45bf5..0aa4c7323 100644
--- a/bukkit-legacy/loader/build.gradle
+++ b/bukkit-legacy/loader/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
 processResources {
     filesMatching('plugin.yml') {
-        expand 'version': project.ext.fullVersion
+        expand 'pluginVersion': project.ext.fullVersion
     }
 }
 
diff --git a/bukkit-legacy/loader/src/main/resources/plugin.yml b/bukkit-legacy/loader/src/main/resources/plugin.yml
index c892df5c7..d0d010212 100644
--- a/bukkit-legacy/loader/src/main/resources/plugin.yml
+++ b/bukkit-legacy/loader/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: LuckPerms
-version: @pluginVersion@
+version: ${pluginVersion}
 description: A permissions plugin
 author: Luck
 website: https://luckperms.net
diff --git a/bukkit/build.gradle b/bukkit/build.gradle
index b84107fbd..c040822ff 100644
--- a/bukkit/build.gradle
+++ b/bukkit/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'com.github.johnrengelman.shadow' version '7.0.0'
-    id 'java'
 }
 
 repositories {
@@ -18,7 +17,7 @@ dependencies {
         exclude(module: 'adventure-api')
         exclude(module: 'adventure-nbt')
     }
-    compileOnly 'me.lucko:commodore:1.9'
+    compileOnly 'me.lucko:commodore:1.10'
     compileOnly('net.milkbowl.vault:VaultAPI:1.7') {
         exclude(module: 'bukkit')
     }
diff --git a/bukkit/loader/build.gradle b/bukkit/loader/build.gradle
index 564829b37..52d01ecf8 100644
--- a/bukkit/loader/build.gradle
+++ b/bukkit/loader/build.gradle
@@ -15,7 +15,7 @@ dependencies {
 
 processResources {
     filesMatching('plugin.yml') {
-        expand 'version': project.ext.fullVersion
+        expand 'pluginVersion': project.ext.fullVersion
     }
 }
 
diff --git a/bukkit/loader/src/main/resources/plugin.yml b/bukkit/loader/src/main/resources/plugin.yml
index adbbb3fd2..708025aee 100644
--- a/bukkit/loader/src/main/resources/plugin.yml
+++ b/bukkit/loader/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: LuckPerms
-version: @pluginVersion@
+version: ${pluginVersion}
 description: A permissions plugin
 author: Luck
 website: https://luckperms.net
diff --git a/bungee/loader/build.gradle b/bungee/loader/build.gradle
index 014465fb5..10de5e9e5 100644
--- a/bungee/loader/build.gradle
+++ b/bungee/loader/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
 processResources {
     filesMatching('plugin.yml') {
-        expand 'version': project.ext.fullVersion
+        expand 'pluginVersion': project.ext.fullVersion
     }
 }
 
diff --git a/bungee/loader/src/main/resources/plugin.yml b/bungee/loader/src/main/resources/plugin.yml
index 58e7f88a9..7b71717d3 100644
--- a/bungee/loader/src/main/resources/plugin.yml
+++ b/bungee/loader/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: LuckPerms
-version: @pluginVersion@
+version: ${pluginVersion}
 description: A permissions plugin
 author: Luck
 main: me.lucko.luckperms.bungee.loader.BungeeLoaderPlugin
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 85b9e2f52..24672bd2f 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -2,7 +2,7 @@ import net.fabricmc.loom.task.RemapJarTask
 
 plugins {
     id 'com.github.johnrengelman.shadow' version '7.0.0'
-    id 'fabric-loom' version '0.6-SNAPSHOT'
+    id 'fabric-loom' version '0.9.+'
 }
 
 archivesBaseName = 'luckperms'
@@ -12,16 +12,11 @@ repositories {
     mavenLocal()
 }
 
-def minecraftVersion = '1.16.4'
-def yarnBuild = 7
-def loaderVersion = '0.10.8'
-def fabricApiVersion = '0.28.4+1.16'
-
 dependencies {
-    // Fabric Stuff, We don't specifically target only a single version but yarn mappings require a version to be specified.
-    minecraft "com.mojang:minecraft:${minecraftVersion}"
-    mappings "net.fabricmc:yarn:${minecraftVersion}+build.${yarnBuild}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${loaderVersion}"
+    // https://modmuss50.me/fabric.html
+    minecraft 'com.mojang:minecraft:1.17.1'
+    mappings 'net.fabricmc:yarn:1.17.1+build.39:v2'
+    modImplementation 'net.fabricmc:fabric-loader:0.11.6'
 
     Set<String> apiModules = [
             'fabric-api-base',
@@ -31,7 +26,7 @@ dependencies {
     ]
 
     apiModules.forEach {
-        modImplementation(fabricApi.module(it, fabricApiVersion))
+        modImplementation(fabricApi.module(it, '0.38.0+1.17'))
     }
 
     include(modImplementation('me.lucko:fabric-permissions-api:0.1-SNAPSHOT'))
diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java
index 5b5127d67..94f53d1b7 100644
--- a/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java
+++ b/fabric/src/main/java/me/lucko/luckperms/fabric/FabricSenderFactory.java
@@ -101,7 +101,7 @@ public class FabricSenderFactory extends SenderFactory<LPFabricPlugin, ServerCom
 
     @Override
     protected void performCommand(ServerCommandSource sender, String command) {
-        sender.getMinecraftServer().getCommandManager().execute(sender, command);
+        sender.getServer().getCommandManager().execute(sender, command);
     }
 
     @Override
diff --git a/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java b/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java
index 215b37381..0f2423945 100644
--- a/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java
+++ b/fabric/src/main/java/me/lucko/luckperms/fabric/LPFabricBootstrap.java
@@ -230,13 +230,13 @@ public final class LPFabricBootstrap implements LuckPermsBootstrap, DedicatedSer
 
     @Override
     public Optional<UUID> lookupUniqueId(String username) {
-        return getServer().map(MinecraftServer::getUserCache).map(c -> c.findByName(username)).map(GameProfile::getId);
+        return getServer().map(MinecraftServer::getUserCache).flatMap(c -> c.findByName(username)).map(GameProfile::getId);
 
     }
 
     @Override
     public Optional<String> lookupUsername(UUID uniqueId) {
-        return getServer().map(MinecraftServer::getUserCache).map(c -> c.getByUuid(uniqueId)).map(GameProfile::getName);
+        return getServer().map(MinecraftServer::getUserCache).flatMap(c -> c.getByUuid(uniqueId)).map(GameProfile::getName);
     }
 
     @Override
diff --git a/nukkit/loader/build.gradle b/nukkit/loader/build.gradle
index cf2d0755e..953463948 100644
--- a/nukkit/loader/build.gradle
+++ b/nukkit/loader/build.gradle
@@ -16,7 +16,7 @@ dependencies {
 
 processResources {
     filesMatching('plugin.yml') {
-        expand 'version': project.ext.fullVersion
+        expand 'pluginVersion': project.ext.fullVersion
     }
 }
 
diff --git a/nukkit/loader/src/main/resources/plugin.yml b/nukkit/loader/src/main/resources/plugin.yml
index cf2c48e00..0ab32a8b2 100644
--- a/nukkit/loader/src/main/resources/plugin.yml
+++ b/nukkit/loader/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: LuckPerms
-version: @pluginVersion@
+version: ${pluginVersion}
 api: ["1.0.5"]
 description: A permissions plugin
 author: Luck