diff --git a/fabric/build.gradle b/fabric/build.gradle
index 86b32aa..bb08951 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -25,7 +25,14 @@ configurations {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
 
-    modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version"
+    Set<String> apiModules = [
+            "fabric-command-api-v2",
+            "fabric-lifecycle-events-v1",
+    ]
+
+    apiModules.forEach {
+        include(modImplementation(fabricApi.module(it, rootProject.fabric_api_version)))
+    }
 
     common(project(path: ':common:', configuration: 'namedElements')) { transitive false }
     shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index dfd9998..541c189 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -25,8 +25,7 @@
   "depends": {
     "fabricloader": ">=0.16.10",
     "minecraft": "~1.21",
-    "java": ">=21",
-    "fabric-api": "*"
+    "java": ">=21"
   },
   "suggests": {
     "another-mod": "*"