diff --git a/config/logging.go b/config/logging.go
index e9839bddb..262311f00 100644
--- a/config/logging.go
+++ b/config/logging.go
@@ -68,8 +68,8 @@ func (l *LogStreamConfig) Validate() error {
 type LokiConfig struct {
 	TenantId    *string `toml:"tenant_id"`
 	Endpoint    *string `toml:"endpoint"`
-	BasicAuth   *string `toml:"basic_auth"`
-	BearerToken *string `toml:"bearer_token"`
+	BasicAuth   *string `toml:"basic_auth_secret"`
+	BearerToken *string `toml:"bearer_token_secret"`
 }
 
 // Validate checks that the loki config is valid, which means that
@@ -90,7 +90,7 @@ func (l *LokiConfig) Validate() error {
 type GrafanaConfig struct {
 	BaseUrl      *string `toml:"base_url"`
 	DashboardUrl *string `toml:"dashboard_url"`
-	BearerToken  *string `toml:"bearer_token"`
+	BearerToken  *string `toml:"bearer_token_secret"`
 }
 
 // Validate checks that the grafana config is valid, which means that
diff --git a/config/pyroscope.go b/config/pyroscope.go
index 938e8f15d..097954607 100644
--- a/config/pyroscope.go
+++ b/config/pyroscope.go
@@ -10,7 +10,7 @@ import (
 type PyroscopeConfig struct {
 	Enabled     *bool   `toml:"enabled"`
 	ServerUrl   *string `toml:"server_url"`
-	Key         *string `toml:"key"`
+	Key         *string `toml:"key_secret"`
 	Environment *string `toml:"environment"`
 }