diff --git a/.configure b/.configure
index f047b93cf6f8..a2b3cb2c9a0a 100644
--- a/.configure
+++ b/.configure
@@ -1,7 +1,7 @@
 {
   "project_name": "WordPress-Android",
   "branch": "trunk",
-  "pinned_hash": "ccf321783e91fa1523f456d0cc8573d1e32493d2",
+  "pinned_hash": "94d7d64cac981ddb97bb3b80b408ec2ceb86fe91",
   "files_to_copy": [
     {
       "file": "android/WPAndroid/secrets.properties",
@@ -44,7 +44,5 @@
       "encrypt": true
     }
   ],
-  "file_dependencies": [
-
-  ]
+  "file_dependencies": []
 }
\ No newline at end of file
diff --git a/.configure-files/secrets.properties.enc b/.configure-files/secrets.properties.enc
index 627b44b9d2b1..385616fd13b4 100644
Binary files a/.configure-files/secrets.properties.enc and b/.configure-files/secrets.properties.enc differ
diff --git a/config/gradle/gradle_build_scan.gradle b/config/gradle/gradle_build_scan.gradle
index 3cc0913ff88c..50753ddc0701 100644
--- a/config/gradle/gradle_build_scan.gradle
+++ b/config/gradle/gradle_build_scan.gradle
@@ -1,19 +1,22 @@
-
 // Only run build scan on CI builds.
-if (gradle.ext.isCi) {
-    develocity {
+develocity {
+    if (gradle.ext.secretProperties.get('measureBuildsEnabled')?.toBoolean() ?: false) {
         buildScan {
-            termsOfUseUrl = 'https://gradle.com/terms-of-service'
-            termsOfUseAgree = 'yes'
-            tag 'CI'
-            publishing.onlyIf { true }
-            uploadInBackground = false
-        }
-    }
-} else {
-    develocity {
-        buildScan {
-            publishing.onlyIf { false }
+            server = "https://develocity.a8c-ci.services/"
+            accessKey = gradle.ext.secretProperties["develocityToken"]
+
+            if (gradle.ext.isCi) {
+                uploadInBackground = false
+            } else {
+                obfuscation {
+                    hostname { "" }
+                    ipAddresses { it.collect { "0.0.0.0" } }
+                }
+            }
         }
+    } else if (gradle.ext.isCi) {
+        termsOfUseUrl = 'https://gradle.com/terms-of-service'
+        termsOfUseAgree = 'yes'
+        uploadInBackground = false
     }
 }