diff --git a/swh/templates/web/configmap.yaml b/swh/templates/web/configmap.yaml
index fc358906ef5060edcbfacf03c959b95ae1820e91..b9448836a027bfd5de347b8b4ddedd8f1866d1ec 100644
--- a/swh/templates/web/configmap.yaml
+++ b/swh/templates/web/configmap.yaml
@@ -7,7 +7,9 @@ metadata:
   name: web-configuration-template
 data:
   config.yml.template: |
-    {{- include "swh.storageConfiguration" (list .Values . .Values.web.storageConfigurationRef) | nindent 4 }}
+    {{- include "swh.service.fromYaml" (dict "service" "storage"
+                                             "configurationRef" .Values.web.storageConfigurationRef
+                                             "Values" .Values) | nindent 4 }}
     {{- if .Values.web.searchConfigurationRef }}
       {{- include "swh.service.fromYaml" (dict "service" "search" "configurationRef" .Values.web.searchConfigurationRef "Values" .Values) | nindent 4 }}
     {{- end -}}
diff --git a/swh/values/production/swh-cassandra.yaml b/swh/values/production/swh-cassandra.yaml
index 5766140c20d72da7777fae4425c2db83eaf04b25..27cdc1b8d38b5f056255816135a802470475a0d3 100644
--- a/swh/values/production/swh-cassandra.yaml
+++ b/swh/values/production/swh-cassandra.yaml
@@ -47,6 +47,10 @@ localRpcROStorageService:
 localRpcROStorageConfiguration:
   storageConfigurationRef: localRpcROStorageService
 
+remoteStorageConfiguration:
+  cls: remote
+  host: http://storage:5002
+
 storage_replayer:
   enabled: true
 
@@ -277,7 +281,7 @@ web:
   databaseConfigurationRef: postgresqlWebConfiguration
   searchConfigurationRef: remoteSearchConfiguration
   schedulerConfigurationRef: remoteSchedulerConfiguration
-  storageConfigurationRef: localRpcROStorageConfiguration
+  storageConfigurationRef: remoteStorageConfiguration
   vaultConfigurationRef: remoteVaultConfiguration
   indexerStorageConfigurationRef: remoteIndexerStorageConfiguration
   countersConfigurationRef: remoteCountersConfiguration
diff --git a/swh/values/staging/default.yaml b/swh/values/staging/default.yaml
index 167ed8ee356e19fde4d574dae0c46688110bbdd4..54db15a1fd7c1e9d6b2b7f82b84b9dfd89db81a1 100644
--- a/swh/values/staging/default.yaml
+++ b/swh/values/staging/default.yaml
@@ -192,19 +192,6 @@ journalWriterConfiguration:
   producer_config:
     message.max.bytes: 1000000000
 
-
-localRpcRWStorageConfiguration:
-  cls: remote
-  host: http://storage:5002
-
-rpcRWStorageConfiguration:
-  pipelineStepsRef: storagePipelineSteps
-  storageConfigurationRef: localRpcRWStorageConfiguration
-
-# (Not so) readonly (namespace local) storage
-localRpcROStorageConfiguration:
-  storageConfigurationRef: localRpcRWStorageConfiguration
-
 webThrottling:
   internalExemptedNetworkRangesRef: stagingNetworkRanges
   cache_uri: memcached:11211
diff --git a/swh/values/staging/swh-cassandra.yaml b/swh/values/staging/swh-cassandra.yaml
index bee733d8a73c19090b4d9dc80215f7ef66543716..6e52cc49b497a82dafa62fe01051f6031ec83e34 100644
--- a/swh/values/staging/swh-cassandra.yaml
+++ b/swh/values/staging/swh-cassandra.yaml
@@ -1,5 +1,21 @@
 namespace: swh-cassandra
 
+remoteStorageConfiguration:
+  cls: remote
+  host: http://storage:5002
+
+localRpcRWStorageConfiguration:
+  cls: remote
+  host: http://storage:5002
+
+rpcRWStorageConfiguration:
+  pipelineStepsRef: storagePipelineSteps
+  storageConfigurationRef: localRpcRWStorageConfiguration
+
+# (Not so) readonly (namespace local) storage
+localRpcROStorageConfiguration:
+  storageConfigurationRef: localRpcRWStorageConfiguration
+
 cassandraSeeds:
   - cassandra1.internal.staging.swh.network
   - cassandra2.internal.staging.swh.network
@@ -540,7 +556,7 @@ web:
   databaseConfigurationRef: postgresqlWebConfiguration
   searchConfigurationRef: remoteSearchConfiguration
   schedulerConfigurationRef: remoteSchedulerConfiguration
-  storageConfigurationRef: localRpcROStorageConfiguration
+  storageConfigurationRef: remoteStorageConfiguration
   vaultConfigurationRef: remoteVaultConfiguration
   indexerStorageConfigurationRef: remoteIndexerStorageConfiguration
   countersConfigurationRef: remoteCountersConfiguration
diff --git a/swh/values/staging/swh.yaml b/swh/values/staging/swh.yaml
index 0b7b4fb7188c86b936010c63d92d8a51e40d3e0e..654fe4657de5d4d0c0a9e6bb2241bb2c5520bc88 100644
--- a/swh/values/staging/swh.yaml
+++ b/swh/values/staging/swh.yaml
@@ -1,4 +1,5 @@
 
+
 remoteStorageConfiguration:
   cls: remote
   url: http://storage1.internal.staging.swh.network:5002