diff --git a/build.gradle b/build.gradle
index a32fc232606..7f358389c28 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,6 @@ buildscript {
             url = "https://artifactory.terasology.io/artifactory/virtual-repo-live"
         }
 
-        // TODO MYSTERY: As of November 7th 2011 virtual-repo-live could no longer be relied on for latest snapshots - Pro feature?
-        // We've been using it that way for *years* and nothing likewise changed in the area for years as well. This seems to work ....
         maven {
             name = "Terasology snapshot locals"
             url = "https://artifactory.terasology.io/artifactory/terasology-snapshot-local"
@@ -104,7 +102,7 @@ dependencies {
 
 
     // Config for our code analytics lives in a centralized repo: https://github.com/MovingBlocks/TeraConfig
-    codeMetrics group: 'org.terasology.config', name: 'codemetrics', version: '1.6.3', ext: 'zip'
+    codeMetrics group: 'org.terasology.config', name: 'codemetrics', version: '2.0.0', ext: 'zip'
 
     // Natives for JNLua (Kallisti, KComputers)
     natives group: 'org.terasology.jnlua', name: 'jnlua_natives', version: '0.1.0-SNAPSHOT', ext: 'zip'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d11cdd907dd..8838ba97ba0 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.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/templates/build.gradle b/templates/build.gradle
index 5a4a69661de..57cf963d5ce 100644
--- a/templates/build.gradle
+++ b/templates/build.gradle
@@ -10,8 +10,6 @@ buildscript {
             url = "https://artifactory.terasology.io/artifactory/virtual-repo-live"
         }
 
-        // TODO MYSTERY: As of November 7th 2011 virtual-repo-live could no longer be relied on for latest snapshots - Pro feature?
-        // We've been using it that way for *years* and nothing likewise changed in the area for years as well. This seems to work ....
         maven {
             name = "Terasology snapshot locals"
             url = "https://artifactory.terasology.io/artifactory/terasology-snapshot-local"