diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java
index 3c4cd8e1c1f..fd0394fb237 100644
--- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java
+++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/FirstEntryPoint.java
@@ -33,7 +33,11 @@
 import java.lang.management.RuntimeMXBean;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -122,7 +126,7 @@ public void init(EarlyInitAgentConfig earlyConfig) {
         startupLogger.trace("OS: " + System.getProperty("os.name"));
         startupLogger.trace("Classpath: " + System.getProperty("java.class.path"));
         startupLogger.trace("Netty versions: " + NettyVersions.extract());
-        startupLogger.trace("Env: " + System.getenv());
+        startupLogger.trace("Env: " + findEnvVariables());
         startupLogger.trace("System properties: " + findSystemProperties());
       }
 
@@ -138,6 +142,30 @@ public void init(EarlyInitAgentConfig earlyConfig) {
     }
   }
 
+  private static Map<String, String> findEnvVariables() {
+    Map<String, String> env = System.getenv();
+    return env.entrySet().stream()
+        .map(
+            entry -> {
+              String key = entry.getKey();
+              String value = entry.getValue().toString();
+              String valueToDisplay = maskValueOfSensitiveKey(key, value);
+              return new SimpleEntry<>(key, valueToDisplay);
+            })
+        .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+  }
+
+  private static String maskValueOfSensitiveKey(String key, String value) {
+    return isSensitive(key) ? "***" : value;
+  }
+
+  private static boolean isSensitive(String key) {
+    String keyInLowerCase = key.toLowerCase(Locale.ROOT);
+    return keyInLowerCase.contains("password")
+        || keyInLowerCase.contains("pwd")
+        || keyInLowerCase.contains("secret");
+  }
+
   private static void checkTlsConnectionsToVirtualServersEnabled() {
     String tlsConnectionsToVirtualServersProp = "jsse.enableSNIExtension";
     String propValue = System.getProperty(tlsConnectionsToVirtualServersProp);
@@ -156,7 +184,8 @@ private static String findSystemProperties() {
           if (!firstProperty) {
             propsBuilder.append(", ");
           }
-          propsBuilder.append("(" + key + "=" + value + ")");
+          String valueToDisplay = maskValueOfSensitiveKey(key.toString(), value.toString());
+          propsBuilder.append("(" + key + "=" + valueToDisplay + ")");
         });
     return propsBuilder.toString();
   }