diff --git a/changelog/unreleased/fix-cache-store-env.md b/changelog/unreleased/fix-cache-store-env.md
new file mode 100644
index 00000000000..bccfe1d5722
--- /dev/null
+++ b/changelog/unreleased/fix-cache-store-env.md
@@ -0,0 +1,6 @@
+Bugfix: adjust cache related configuration options
+
+We've adjusted cache related configuration options of the
+gateway and storage-users service to the other services.
+
+https://github.com/owncloud/ocis/pull/5087
diff --git a/services/gateway/pkg/config/config.go b/services/gateway/pkg/config/config.go
index 4b27f67b73f..8a9829df593 100644
--- a/services/gateway/pkg/config/config.go
+++ b/services/gateway/pkg/config/config.go
@@ -87,8 +87,8 @@ type StorageRegistry struct {
 
 // Cache holds cache config
 type Cache struct {
-	Store              string   `yaml:"store" env:"GATEWAY_CACHE_STORE" desc:"Store implementation for the cache. Valid values are \"memory\" (default), \"redis\", and \"etcd\"."`
-	Nodes              []string `yaml:"nodes" env:"GATEWAY_CACHE_NODES" desc:"Node addresses to use for the cache store."`
+	Store              string   `yaml:"store" env:"OCIS_CACHE_STORE_TYPE;GATEWAY_CACHE_STORE_TYPE;GATEWAY_CACHE_STORE" desc:"Store implementation for the cache. Valid values are \"memory\" (default), \"redis\", and \"etcd\"."`
+	Nodes              []string `yaml:"nodes" env:"OCIS_CACHE_STORE_ADDRESS;GATEWAY_CACHE_STORE_ADDRESS;GATEWAY_CACHE_NODES" desc:"Node addresses to use for the cache store."`
 	Database           string   `yaml:"database" env:"GATEWAY_CACHE_DATABASE" desc:"Database name of the cache."`
 	StatCacheTTL       int      `yaml:"stat_cache_ttl" env:"GATEWAY_STAT_CACHE_TTL" desc:"Max TTL in seconds for the gateway's stat cache."`
 	ProviderCacheTTL   int      `yaml:"provider_cache_ttl" env:"GATEWAY_PROVIDER_CACHE_TTL" desc:"Max TTL in seconds for the gateway's provider cache."`
diff --git a/services/storage-users/pkg/config/config.go b/services/storage-users/pkg/config/config.go
index 5fc019b95d1..ad77c9fb657 100644
--- a/services/storage-users/pkg/config/config.go
+++ b/services/storage-users/pkg/config/config.go
@@ -144,8 +144,8 @@ type Events struct {
 
 // Cache holds cache config
 type Cache struct {
-	Store    string   `yaml:"store" env:"STORAGE_USERS_CACHE_STORE" desc:"Store implementation for the cache. Valid values are \"memory\" (default), \"redis\", and \"etcd\"."`
-	Nodes    []string `yaml:"nodes" env:"STORAGE_USERS_CACHE_NODES" desc:"Node addresses to use for the cache store."`
+	Store    string   `yaml:"store" env:"OCIS_CACHE_STORE_TYPE;STORAGE_USERS_CACHE_STORE_TYPE;STORAGE_USERS_CACHE_STORE" desc:"Store implementation for the cache. Valid values are \"memory\" (default), \"redis\", and \"etcd\"."`
+	Nodes    []string `yaml:"nodes" env:"OCIS_CACHE_STORE_ADDRESS;STORAGE_USERS_CACHE_STORE_ADDRESS;STORAGE_USERS_CACHE_NODES" desc:"Node addresses to use for the cache store."`
 	Database string   `yaml:"database" env:"STORAGE_USERS_CACHE_DATABASE" desc:"Database name of the cache."`
 }