diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
index a954c8292..abebc77b1 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -25,7 +25,7 @@
   ],
   "depends": {
     "fabricloader": ">=0.14.22",
-    "minecraft": ["1.21.6", "1.21.7"]
+    "minecraft": ["1.21.6", "1.21.7", "1.21.8"]
   },
   "custom": {
     "modmenu": {
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
index 04c8727bf..f5e822b4f 100644
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -35,6 +35,6 @@ A Minecraft pathfinder bot.
 modId="minecraft"
 mandatory=true
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[1.21.6, 1.21.7]"
+versionRange="[1.21.6, 1.21.8]"
 ordering="NONE"
 side="BOTH"
diff --git a/gradle.properties b/gradle.properties
index 203156a79..0a1999772 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,11 +8,11 @@ archives_base_name=baritone
 
 java_version=21
 
-minecraft_version=1.21.7
+minecraft_version=1.21.8
 
-forge_version=57.0.0
+forge_version=58.0.0
 
-neoforge_version=1-beta
+neoforge_version=2-beta
 
 fabric_version=0.16.14
 
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
index a48d98be1..ba78c05af 100644
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -35,6 +35,6 @@ A Minecraft pathfinder bot.
 modId="minecraft"
 type="required"
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
-versionRange="[1.21.6, 1.21.7]"
+versionRange="[1.21.6, 1.21.8]"
 ordering="NONE"
 side="BOTH"