diff --git a/settings.gradle b/settings.gradle
index 2149bca09b6..b7617fddac5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -49,10 +49,11 @@ gradleEnterprise {
             setTermsOfServiceUrl("https://gradle.com/terms-of-service")
             setTermsOfServiceAgree("yes")
         }
+
         obfuscation {
             ipAddresses { addresses -> ["0.0.0.0"] }
-            hostname { host -> "<unknown>" }
-            username { name -> "<unknown>" }
+            hostname { host -> "concealed" }
+            username { name -> buildProperties.isTeamcityBuild ? "TeamCity" : "concealed" }
         }
     }
 }