diff --git a/swh/templates/storage/configmap.yaml b/swh/templates/storage/configmap.yaml
index 41c41b577b549b9276017cbf639545e48262fabf..21a6e48901affe7b7fd649e1fd1aaf1ad166e1ad 100644
--- a/swh/templates/storage/configmap.yaml
+++ b/swh/templates/storage/configmap.yaml
@@ -21,5 +21,5 @@ data:
         {{- end }}
       {{- end }}
       objstorage:
-        cls: noop
+      {{- toYaml .Values.storage.objstorage | nindent 8 }}
 {{- end -}}
diff --git a/swh/values.yaml b/swh/values.yaml
index bb27854e490e4e369a92dc394c78d22d0351cd88..afdeec9fcfd89ff45197e0bf03c1af845b9a98c7 100644
--- a/swh/values.yaml
+++ b/swh/values.yaml
@@ -194,6 +194,8 @@ storage:
       - seed1
     keySpace: swh
     consistencyLevel: LOCAL_QUORUM
+  objstorage:
+    cls: noop
 
 statsd_exporter:
   enabled: false