diff --git a/data/common/common.yaml b/data/common/common.yaml
--- a/data/common/common.yaml
+++ b/data/common/common.yaml
@@ -2464,6 +2464,27 @@
   args:
     db: "postgresql://%{hiera('swh::deploy::worker::lister::db::user')}:%{hiera('swh::deploy::lister::db::password')}@%{hiera('swh::deploy::worker::lister::db::host')}:%{hiera('swh::deploy::worker::lister::db::port')}/%{hiera('swh::deploy::worker::lister::db::name')}"
 
+swh::deploy::lister::queues:
+  - swh.lister.bitbucket.tasks.IncrementalBitBucketLister
+  - swh.lister.bitbucket.tasks.FullBitBucketRelister
+  - swh.lister.cgit.tasks.CGitListerTask
+  - swh.lister.cran.tasks.CRANListerTask
+  - swh.lister.debian.tasks.DebianListerTask
+  - swh.lister.gitea.tasks.IncrementalGiteaLister
+  - swh.lister.gitea.tasks.RangeGiteaLister
+  - swh.lister.gitea.tasks.FullGiteaRelister
+  - swh.lister.gitlab.tasks.IncrementalGitLabLister
+  - swh.lister.gitlab.tasks.RangeGitLabLister
+  - swh.lister.gitlab.tasks.FullGitLabRelister
+  - swh.lister.gnu.tasks.GNUListerTask
+  - swh.lister.launchpad.tasks.FullLaunchpadLister
+  - swh.lister.launchpad.tasks.IncrementalLaunchpadLister
+  - swh.lister.npm.tasks.NpmListerTask
+  - swh.lister.phabricator.tasks.FullPhabricatorLister
+  - swh.lister.pypi.tasks.PyPIListerTask
+  - swh.lister.sourceforge.tasks.FullSourceForgeLister
+  - swh.lister.sourceforge.tasks.IncrementalSourceForgeLister
+
 swh::deploy::lister::sentry_swh_package: swh.lister
 swh::deploy::lister::sentry_environment: "%{alias('swh::deploy::environment')}"
 swh::deploy::lister::sentry_dsn: "https://%{lookup('swh::deploy::lister::sentry_token')}@sentry.softwareheritage.org/6"
@@ -2476,26 +2497,7 @@
   lister: "%{alias('swh::deploy::lister::db::local')}"
   celery:
     task_broker: "%{alias('swh::deploy::worker::task_broker')}"
-    task_queues:
-      - swh.lister.bitbucket.tasks.IncrementalBitBucketLister
-      - swh.lister.bitbucket.tasks.FullBitBucketRelister
-      - swh.lister.cgit.tasks.CGitListerTask
-      - swh.lister.cran.tasks.CRANListerTask
-      - swh.lister.debian.tasks.DebianListerTask
-      - swh.lister.gitea.tasks.IncrementalGiteaLister
-      - swh.lister.gitea.tasks.RangeGiteaLister
-      - swh.lister.gitea.tasks.FullGiteaRelister
-      - swh.lister.gitlab.tasks.IncrementalGitLabLister
-      - swh.lister.gitlab.tasks.RangeGitLabLister
-      - swh.lister.gitlab.tasks.FullGitLabRelister
-      - swh.lister.gnu.tasks.GNUListerTask
-      - swh.lister.launchpad.tasks.FullLaunchpadLister
-      - swh.lister.launchpad.tasks.IncrementalLaunchpadLister
-      - swh.lister.npm.tasks.NpmListerTask
-      - swh.lister.phabricator.tasks.FullPhabricatorLister
-      - swh.lister.pypi.tasks.PyPIListerTask
-      - swh.lister.sourceforge.tasks.FullSourceForgeLister
-      - swh.lister.sourceforge.tasks.IncrementalSourceForgeLister
+    task_queues: "%{alias('swh::deploy::lister::queues')}"
   credentials: "%{alias('swh::deploy::worker::lister::config::credentials')}"
 
 swh::deploy::loader_mercurial::sentry_swh_package: swh.loader.mercurial
diff --git a/data/deployments/staging/common.yaml b/data/deployments/staging/common.yaml
--- a/data/deployments/staging/common.yaml
+++ b/data/deployments/staging/common.yaml
@@ -329,3 +329,26 @@
   uri: '/browse/snapshot/48dcf76ec1a3bd57ec117b1dace633691fdfd70d/branches/'
   regexp:
     - 'refs/tags/syslinux-3.20-pre2.*refs/tags/syslinux-3.20-pre3.*'
+
+
+swh::deploy::lister::queues:
+  - swh.lister.bitbucket.tasks.IncrementalBitBucketLister
+  - swh.lister.bitbucket.tasks.FullBitBucketRelister
+  - swh.lister.cgit.tasks.CGitListerTask
+  - swh.lister.cran.tasks.CRANListerTask
+  - swh.lister.debian.tasks.DebianListerTask
+  - swh.lister.gitea.tasks.IncrementalGiteaLister
+  - swh.lister.gitea.tasks.RangeGiteaLister
+  - swh.lister.gitea.tasks.FullGiteaRelister
+  - swh.lister.gitlab.tasks.IncrementalGitLabLister
+  - swh.lister.gitlab.tasks.RangeGitLabLister
+  - swh.lister.gitlab.tasks.FullGitLabRelister
+  - swh.lister.gnu.tasks.GNUListerTask
+  - swh.lister.launchpad.tasks.FullLaunchpadLister
+  - swh.lister.launchpad.tasks.IncrementalLaunchpadLister
+  - swh.lister.npm.tasks.NpmListerTask
+  - swh.lister.phabricator.tasks.FullPhabricatorLister
+  - swh.lister.pypi.tasks.PyPIListerTask
+  - swh.lister.sourceforge.tasks.FullSourceForgeLister
+  - swh.lister.sourceforge.tasks.IncrementalSourceForgeLister
+  - swh.lister.opam.tasks.OpamListerTask