diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 89af65d3e1c..7a634a4a88f 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -21,8 +21,6 @@ repositories {
         url = URI("https://artifactory.terasology.io/artifactory/virtual-repo-live")
     }
 
-    // TODO MYSTERY: As of November 7th 2021 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 = URI("https://artifactory.terasology.io/artifactory/terasology-snapshot-local")
diff --git a/build-logic/src/main/kotlin/terasology-repositories.gradle.kts b/build-logic/src/main/kotlin/terasology-repositories.gradle.kts
index 105a1c79d81..f238ab5557f 100644
--- a/build-logic/src/main/kotlin/terasology-repositories.gradle.kts
+++ b/build-logic/src/main/kotlin/terasology-repositories.gradle.kts
@@ -48,8 +48,6 @@ repositories {
         }
     }
 
-    // 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 = URI("https://artifactory.terasology.io/artifactory/terasology-snapshot-local")
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/engine/build.gradle b/engine/build.gradle
index e10ec9d3b40..562ae47c417 100644
--- a/engine/build.gradle
+++ b/engine/build.gradle
@@ -247,7 +247,7 @@ def createVersionInfoFile = tasks.register("createVersionInfoFile", WritePropert
         // It is a value we can always get (on Jenkins or otherwise) but we don't want local builds
         // to invalidate their cache whenever the time changes.
         // TODO: after upgrading to Gradle 6.8, see if we can have it ignore this property specifically:
-        //     https://docs.gradle.org/current/userguide/more_about_tasks.html#sec:property_file_normalization
+        //     https://docs.gradle.org/current/userguide/incremental_build.html#sec:property_file_normalization
         property("dateTime", startDateTimeString)
     }
 
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"