diff --git a/conf/loader.yml b/conf/loader.yml
index e261c90..39753ae 100644
--- a/conf/loader.yml
+++ b/conf/loader.yml
@@ -1,37 +1,49 @@
 storage:
-  cls: remote
+  cls: filter
   args:
-    url: http://swh-storage:5002/
+    storage:
+      cls: buffer
+      args:
+        storage:
+          cls: remote
+          args:
+            url: http://swh-storage:5002/
+        min_batch_size:
+          content: 10000
+          content_bytes: 104857600
+          directory: 1000
+          revision: 1000
+
 celery:
   task_broker: amqp://guest:guest@amqp//
   task_modules:
     - swh.loader.dir.tasks
     - swh.loader.git.tasks
     - swh.loader.mercurial.tasks
     - swh.loader.npm.tasks
     - swh.loader.pypi.tasks
     - swh.loader.svn.tasks
     - swh.loader.tar.tasks
     - swh.deposit.loader.tasks
     - swh.loader.package.tasks
 
   task_queues:
     - swh.loader.package.tasks.LoadDebian
     - swh.loader.dir.tasks.LoadDirRepository
     - swh.loader.git.tasks.LoadDiskGitRepository
     - swh.loader.git.tasks.UncompressAndLoadDiskGitRepository
     - swh.loader.git.tasks.UpdateGitRepository
     - swh.loader.mercurial.tasks.LoadArchiveMercurial
     - swh.loader.mercurial.tasks.LoadMercurial
     - swh.loader.npm.tasks.LoadNpm
     - swh.loader.pypi.tasks.LoadPyPI
     - swh.loader.svn.tasks.DumpMountAndLoadSvnRepository
     - swh.loader.svn.tasks.LoadSvnRepository
     - swh.loader.svn.tasks.MountAndLoadSvnRepository
     - swh.loader.tar.tasks.LoadTarRepository
     - swh.deposit.loader.tasks.LoadDepositArchiveTsk
     - swh.deposit.loader.tasks.ChecksDepositTsk
 
 lister_db_url: postgresql://postgres@swh-listers-db/swh-listers
 
 url: 'http://swh-deposit:5006'