diff --git a/build.gradle b/build.gradle
index 2d0997e..f1b2077 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,7 +31,7 @@ allprojects {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
         mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
         modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
-        include(modImplementation("net.fabricmc.fabric-api:fabric-command-api-v2:${project.fabric_command_api_version}"))
+        include(modImplementation(fabricApi.module("fabric-command-api-v2", project.fabric_version)))
     }
 
     processResources {
diff --git a/gradle.properties b/gradle.properties
index 6ad5867..27c5cc4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,5 +17,4 @@ maven_group=net.rotgruengelb
 archives_base_name=quirl
 
 # Dependencies
-# fabric_version=0.83.0+1.20
-fabric_command_api_version=2.2.9+fb8d95da7d
+fabric_version=0.83.0+1.20
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index c2757ed..63eea9b 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -24,6 +24,7 @@
   "depends": {
     "fabricloader": ">=0.14.22",
     "minecraft": "1.20.X",
-    "java": ">=17"
+    "java": ">=17",
+    "fabric-command-api-v2": "*"
   }
 }