diff --git a/accounts/pkg/config/config.go b/accounts/pkg/config/config.go
index 78d76ba405..9a4609d7e4 100644
--- a/accounts/pkg/config/config.go
+++ b/accounts/pkg/config/config.go
@@ -44,8 +44,8 @@ type TokenManager struct {
 // Repo defines which storage implementation is to be used.
 type Repo struct {
 	Backend string `ocisConfig:"backend" env:"ACCOUNTS_STORAGE_BACKEND" desc:"Defines which storage implementation is to be used"`
-	Disk    Disk
-	CS3     CS3
+	Disk    Disk   `ocisConfig:"disk"`
+	CS3     CS3    `ocisConfig:"cs3"`
 }
 
 // Disk is the local disk implementation of the storage.
diff --git a/accounts/pkg/config/tracing.go b/accounts/pkg/config/tracing.go
index 8c8b1e0b70..4bd0c79248 100644
--- a/accounts/pkg/config/tracing.go
+++ b/accounts/pkg/config/tracing.go
@@ -2,8 +2,8 @@ package config
 
 // Tracing defines the available tracing configuration.
 type Tracing struct {
-	Enabled   bool   `env:"OCIS_TRACING_ENABLED;ACCOUNTS_TRACING_ENABLED" desc:"Activates tracing."`
-	Type      string `env:"OCIS_TRACING_TYPE;ACCOUNTS_TRACING_TYPE"`
-	Endpoint  string `env:"OCIS_TRACING_ENDPOINT;ACCOUNTS_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
-	Collector string `env:"OCIS_TRACING_COLLECTOR;ACCOUNTS_TRACING_COLLECTOR" `
+	Enabled   bool   `ocisConfig:"enabled" env:"OCIS_TRACING_ENABLED;ACCOUNTS_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `ocisConfig:"type" env:"OCIS_TRACING_TYPE;ACCOUNTS_TRACING_TYPE"`
+	Endpoint  string `ocisConfig:"endpoint" env:"OCIS_TRACING_ENDPOINT;ACCOUNTS_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `ocisConfig:"collector" env:"OCIS_TRACING_COLLECTOR;ACCOUNTS_TRACING_COLLECTOR"`
 }