diff --git a/data/defaults.yaml b/data/defaults.yaml
index 7c3ec3cf20e46386315e6cd05246f9303450faae..8c7c9017ecc5d6308edc8b83fd6a482f670de39e 100644
--- a/data/defaults.yaml
+++ b/data/defaults.yaml
@@ -1971,6 +1971,7 @@ swh::deploy::worker::swh_lister_gitlab::config:
       - swh_lister_gitlab_discover
       - swh_lister_gitlab_refresh
 
+swh::deploy::worker::swh_lister_pypi::config_file: "%{hiera('swh::conf_directory')}/lister_pypi.yml"
 swh::deploy::worker::swh_lister_pypi::concurrency: 1
 swh::deploy::worker::swh_lister_pypi::loglevel: warning
 # Contains a password: in private data
@@ -1987,6 +1988,13 @@ swh::deploy::worker::swh_lister_pypi::config:
     args:
       db: "postgresql://%{hiera('swh::deploy::worker::swh_lister_pypi::db::user')}:%{hiera('swh::deploy::worker::swh_lister_pypi::db::password')}@%{hiera('swh::deploy::worker::swh_lister_pypi::db::host')}/%{hiera('swh::deploy::worker::swh_lister_pypi::db::dbname')}"
   # credentials in private data
+  celery:
+    task_broker: "%{alias('swh::deploy::scheduler::task_broker')}"
+    task_modules:
+      - swh.lister.pypi.tasks
+    task_queues:
+      - swh.lister.pypi.tasks.PyPIListerTask
+      - swh_lister_pypi_refresh
 
 swh::deploy::worker::swh_storage_archiver::conf_directory: "%{hiera('swh::conf_directory')}/archiver"
 swh::deploy::worker::swh_storage_archiver::conf_file: "%{hiera('swh::deploy::worker::swh_storage_archiver::conf_directory')}/worker.yml"
diff --git a/site-modules/profile/manifests/swh/deploy/worker/swh_lister_pypi.pp b/site-modules/profile/manifests/swh/deploy/worker/swh_lister_pypi.pp
index 8ac6f82e73d456bb3875704ca3faece3948c0821..cb46d986be19d3b85ec489d6c722b85c73b3d3bd 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/swh_lister_pypi.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/swh_lister_pypi.pp
@@ -4,7 +4,7 @@ class profile::swh::deploy::worker::swh_lister_pypi {
   $loglevel = lookup('swh::deploy::worker::swh_lister_pypi::loglevel')
   $task_broker = lookup('swh::deploy::worker::swh_lister_pypi::task_broker')
 
-  $config_file = '/etc/softwareheritage/lister-pypi.yml'
+  $config_file = lookup('swh::deploy::worker::swh_lister_pypi::config_file')
   $config = lookup('swh::deploy::worker::swh_lister_pypi::config', Hash, 'deep')
 
   $task_modules = ['swh.lister.pypi.tasks']
@@ -12,7 +12,7 @@ class profile::swh::deploy::worker::swh_lister_pypi {
 
   include ::profile::swh::deploy::base_lister
 
-  ::profile::swh::deploy::worker::instance {'swh_lister_pypi':
+  ::profile::swh::deploy::worker::instance {'lister_pypi':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,