diff --git a/Forge/build.gradle.kts b/Forge/build.gradle.kts
index 0a92dcb..2247bb7 100644
--- a/Forge/build.gradle.kts
+++ b/Forge/build.gradle.kts
@@ -41,6 +41,13 @@ loom {
 	}
 }
 
+configurations.configureEach {
+	// Fix that can be found in Forge MDK too
+	resolutionStrategy {
+		force("net.sf.jopt-simple:jopt-simple:5.0.4")
+	}
+}
+
 dependencies {
 	forge("net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}")
 
diff --git a/NeoForge/src/main/java/betteradvancements/neoforge/config/Config.java b/NeoForge/src/main/java/betteradvancements/neoforge/config/Config.java
index fcfe7a9..4808cb6 100644
--- a/NeoForge/src/main/java/betteradvancements/neoforge/config/Config.java
+++ b/NeoForge/src/main/java/betteradvancements/neoforge/config/Config.java
@@ -27,7 +27,7 @@ public void onLoad(final ModConfigEvent.Loading configEvent) {
     public void onFileChange(final ModConfigEvent.Reloading configEvent) {
         if (configEvent.getConfig().getModId().equals(Constants.ID)) {
             Constants.log.debug("Reloaded {} config file {}", Constants.ID, configEvent.getConfig().getFileName());
-            ((CommentedFileConfig) configEvent.getConfig().getConfigData()).load();
+            ((CommentedFileConfig) configEvent.getConfig().getLoadedConfig().config()).load();
             ConfigValues.pushChanges();
         }
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index dc2c85f..8e6ad0b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ import net.fabricmc.loom.task.RemapJarTask
 plugins {
     base
     id("architectury-plugin") version ("3.4-SNAPSHOT")
-    id("dev.architectury.loom") version ("1.6-SNAPSHOT") apply (false)
+    id("dev.architectury.loom") version ("1.7-SNAPSHOT") apply (false)
     id("com.github.johnrengelman.shadow") version ("8.1.1") apply (false)
 }
 
diff --git a/gradle.properties b/gradle.properties
index c12f840..8ccbe5e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,25 +15,25 @@ githubUrl=way2muchnoise/BetterAdvancements
 platforms=fabric,forge,neoforge
 
 # Minecraft
-minecraftVersion=1.21
-minecraftVersionRange=[1.21, 1.22)
+minecraftVersion=1.21.1
+minecraftVersionRange=[1.21.1, 1.22)
 
 # Forge
-forgeVersion=51.0.16
-loaderVersionRange=[51,)
-forgeVersionRange=[51.0.0,)
+forgeVersion=52.0.8
+loaderVersionRange=[52,)
+forgeVersionRange=[52.0.0,)
 
 # Fabric
-fabricVersion=0.100.3+1.21
-fabricLoaderVersion=0.15.11
+fabricVersion=0.102.1+1.21.1
+fabricLoaderVersion=0.16.2
 
 # NeoForge
-neoforgeVersion=21.0.21-beta
-neoforgeLoaderVersionRange=[2,)
-neoforgeVersionRange=[21.0.0,)
+neoforgeVersion=21.1.26
+neoforgeLoaderVersionRange=[4,)
+neoforgeVersionRange=[21.1.0,)
 
 # Fabric Config screen
-clothVersion=15.0.127
+clothVersion=15.0.130
 modMenuVersion=11.0.1
 
 # Mappings
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23..a441313 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME