diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -1383,7 +1383,6 @@
 swh::deploy::worker::storage::pipeline:
   cls: pipeline
   steps:
-    - cls: retry
     - cls: buffer
       min_batch_size:
         content: 1000
@@ -1392,6 +1391,7 @@
         revision: 1000
         release: 1000
     - cls: filter
+    - cls: retry
     - "%{alias('swh::remote_service::storage::config::writable')}"
 
 # Objstorage backend configurations