diff --git a/build.gradle b/build.gradle
index 9bd00b6..2612a05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -75,8 +75,8 @@ allprojects {
         modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
         modImplementation "com.terraformersmc:modmenu:2.0.10"
-        include modImplementation(fabricApi.module("fabric-tag-extensions-v0", "0.40.1+1.17"))
-        include modImplementation(fabricApi.module("fabric-resource-loader-v0", "0.40.1+1.17"))
+        include modImplementation(fabricApi.module("fabric-tag-extensions-v0", "${project.fabric_version}"))
+        include modImplementation(fabricApi.module("fabric-resource-loader-v0", "${project.fabric_version}"))
     }
 
     configurations {
diff --git a/gradle.properties b/gradle.properties
index 52600f2..cb0233d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,10 +2,12 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.17.1
-yarn_mappings=build.61
-loader_version=0.11.6
+minecraft_version=21w38a
+yarn_mappings=build.9
+loader_version=0.11.7
 # Mod Properties
 mod_version=1.2.3
 maven_group=io.gitlab.jfronny
 archives_base_name=libjf
+
+fabric_version=0.40.4+1.18
\ No newline at end of file