diff --git a/cmd/console.go b/cmd/console.go
index 1b266e6f..758043b0 100644
--- a/cmd/console.go
+++ b/cmd/console.go
@@ -18,7 +18,7 @@ import (
 type ConsoleConfiguration struct {
 	Reporting  reporter.Configuration
 	HTTP       http.Configuration
-	Console    console.Configuration
+	Console    console.Configuration `mapstructure:",squash" yaml:",inline"`
 	ClickHouse clickhousedb.Configuration
 	Auth       authentication.Configuration
 	Database   database.Configuration
diff --git a/cmd/orchestrator.go b/cmd/orchestrator.go
index 7df1b9c3..6607f515 100644
--- a/cmd/orchestrator.go
+++ b/cmd/orchestrator.go
@@ -21,7 +21,7 @@ type OrchestratorConfiguration struct {
 	ClickHouseDB clickhousedb.Configuration `yaml:"-"`
 	ClickHouse   clickhouse.Configuration
 	Kafka        kafka.Configuration
-	Orchestrator orchestrator.Configuration
+	Orchestrator orchestrator.Configuration `mapstructure:",squash" yaml:",inline"`
 	// Other service configurations
 	Inlet   InletConfiguration
 	Console ConsoleConfiguration