diff --git a/services/storage-system/pkg/config/config.go b/services/storage-system/pkg/config/config.go
index 3c2bd3a3c89..a31f1a7684c 100644
--- a/services/storage-system/pkg/config/config.go
+++ b/services/storage-system/pkg/config/config.go
@@ -83,7 +83,7 @@ type OCISDriver struct {
 
 	MaxAcquireLockCycles    int  `yaml:"max_acquire_lock_cycles" env:"STORAGE_SYSTEM_OCIS_MAX_ACQUIRE_LOCK_CYCLES" desc:"When trying to lock files, ocis will try this amount of times to acquire the lock before failing. After each try it will wait for an increasing amount of time. Values of 0 or below will be ignored and the default value of 20 will be used." introductionVersion:"pre5.0"`
 	LockCycleDurationFactor int  `yaml:"lock_cycle_duration_factor" env:"STORAGE_SYSTEM_OCIS_LOCK_CYCLE_DURATION_FACTOR" desc:"When trying to lock files, ocis will multiply the cycle with this factor and use it as a millisecond timeout. Values of 0 or below will be ignored and the default value of 30 will be used." introductionVersion:"pre5.0"`
-	DisableVersioning       bool `yaml:"disable_versioning" env:"STORAGE_SYSTEM_OCIS_DISABLE_VERSIONING" desc:"Disables versioning of files. When set to true new uploads will overwrite existing files instead of creating a new version." introductionVersion:"6.0"`
+	DisableVersioning       bool `yaml:"disable_versioning" env:"OCIS_DISABLE_VERSIONING;STORAGE_SYSTEM_OCIS_DISABLE_VERSIONING" desc:"Disables versioning of files. When set to true, new uploads with the same filename will overwrite existing files instead of creating a new version." introductionVersion:"6.0"`
 }
 
 // Cache holds cache config
diff --git a/services/storage-users/pkg/config/config.go b/services/storage-users/pkg/config/config.go
index 242310a9f49..10addbe2f98 100644
--- a/services/storage-users/pkg/config/config.go
+++ b/services/storage-users/pkg/config/config.go
@@ -138,7 +138,7 @@ type OCISDriver struct {
 	MaxConcurrency          int    `yaml:"max_concurrency" env:"STORAGE_USERS_OCIS_MAX_CONCURRENCY" desc:"Maximum number of concurrent go-routines. Higher values can potentially get work done faster but will also cause more load on the system. Values of 0 or below will be ignored and the default value will be used." introductionVersion:"pre5.0"`
 	AsyncUploads            bool   `yaml:"async_uploads" env:"OCIS_ASYNC_UPLOADS" desc:"Enable asynchronous file uploads." introductionVersion:"pre5.0"`
 	MaxQuota                uint64 `yaml:"max_quota" env:"OCIS_SPACES_MAX_QUOTA;STORAGE_USERS_OCIS_MAX_QUOTA" desc:"Set a global max quota for spaces in bytes. A value of 0 equals unlimited. If not using the global OCIS_SPACES_MAX_QUOTA, you must define the FRONTEND_MAX_QUOTA in the frontend service." introductionVersion:"pre5.0"`
-	DisableVersioning       bool   `yaml:"disable_versioning" env:"STORAGE_USERS_OCIS_DISABLE_VERSIONING" desc:"Disables versioning for files. When set to true new uploads will overwrite existing files instead of creating a new version." introductionVersion:"6.0"`
+	DisableVersioning       bool   `yaml:"disable_versioning" env:"OCIS_DISABLE_VERSIONING;STORAGE_USERS_OCIS_DISABLE_VERSIONING" desc:"Disables versioning of files. When set to true, new uploads with the same filename will overwrite existing files instead of creating a new version." introductionVersion:"6.0"`
 }
 
 // S3NGDriver is the storage driver configuration when using 's3ng' storage driver
@@ -174,7 +174,7 @@ type S3NGDriver struct {
 	MaxAcquireLockCycles    int    `yaml:"max_acquire_lock_cycles" env:"STORAGE_USERS_S3NG_MAX_ACQUIRE_LOCK_CYCLES" desc:"When trying to lock files, ocis will try this amount of times to acquire the lock before failing. After each try it will wait for an increasing amount of time. Values of 0 or below will be ignored and the default value of 20 will be used." introductionVersion:"pre5.0"`
 	LockCycleDurationFactor int    `yaml:"lock_cycle_duration_factor" env:"STORAGE_USERS_S3NG_LOCK_CYCLE_DURATION_FACTOR" desc:"When trying to lock files, ocis will multiply the cycle with this factor and use it as a millisecond timeout. Values of 0 or below will be ignored and the default value of 30 will be used." introductionVersion:"pre5.0"`
 	MaxConcurrency          int    `yaml:"max_concurrency" env:"STORAGE_USERS_S3NG_MAX_CONCURRENCY" desc:"Maximum number of concurrent go-routines. Higher values can potentially get work done faster but will also cause more load on the system. Values of 0 or below will be ignored and the default value of 100 will be used." introductionVersion:"pre5.0"`
-	DisableVersioning       bool   `yaml:"disable_versioning" env:"STORAGE_USERS_S3NG_DISABLE_VERSIONING" desc:"Disables versioning for files. When set to true new uploads will overwrite existing files instead of creating a new version." introductionVersion:"6.0"`
+	DisableVersioning       bool   `yaml:"disable_versioning" env:"OCIS_DISABLE_VERSIONING;STORAGE_USERS_S3NG_DISABLE_VERSIONING" desc:"Disables versioning of files. When set to true, new uploads with the same filename will overwrite existing files instead of creating a new version." introductionVersion:"6.0"`
 }
 
 // OwnCloudSQLDriver is the storage driver configuration when using 'owncloudsql' storage driver