diff --git a/manifests/swh/deploy/worker/swh_indexer_ctags.pp b/manifests/swh/deploy/worker/swh_indexer_ctags.pp
index e4d797f..e5d83eb 100644
--- a/manifests/swh/deploy/worker/swh_indexer_ctags.pp
+++ b/manifests/swh/deploy/worker/swh_indexer_ctags.pp
@@ -1,38 +1,38 @@
 # Deployment for swh-indexer-ctags
 
 class profile::swh::deploy::worker::swh_indexer_ctags {
   include ::profile::swh::deploy::indexer
 
   $concurrency = lookup('swh::deploy::worker::swh_indexer::ctags::concurrency')
   $loglevel = lookup('swh::deploy::worker::swh_indexer::ctags::loglevel')
   $task_broker = lookup('swh::deploy::worker::swh_indexer::ctags::task_broker')
 
   $config_file = '/etc/softwareheritage/indexer/ctags.yml'
   $config = lookup('swh::deploy::worker::swh_indexer::ctags::config')
 
   $task_modules = ['swh.indexer.tasks']
   $task_queues = ['swh_indexer_content_ctags']
 
-  ::profile::swh::deploy::worker::instance {'swh_indexer_ctags':
+  Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_ctags':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
       Class['profile::swh::deploy::indexer'],
       Class['profile::swh::deploy::objstorage_cloud'],
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhdev',
     # Contains passwords
     mode    => '0640',
     content => inline_template("<%= @config.to_yaml %>\n"),
   }
 }
diff --git a/manifests/swh/deploy/worker/swh_indexer_fossology_license.pp b/manifests/swh/deploy/worker/swh_indexer_fossology_license.pp
index 0038241..66ea949 100644
--- a/manifests/swh/deploy/worker/swh_indexer_fossology_license.pp
+++ b/manifests/swh/deploy/worker/swh_indexer_fossology_license.pp
@@ -1,38 +1,38 @@
 # Deployment for swh-indexer-fossology-license
 
 class profile::swh::deploy::worker::swh_indexer_fossology_license {
   include ::profile::swh::deploy::indexer
 
   $concurrency = lookup('swh::deploy::worker::swh_indexer::fossology_license::concurrency')
   $loglevel = lookup('swh::deploy::worker::swh_indexer::fossology_license::loglevel')
   $task_broker = lookup('swh::deploy::worker::swh_indexer::fossology_license::task_broker')
 
   $config_file = '/etc/softwareheritage/indexer/fossology_license.yml'
   $config = lookup('swh::deploy::worker::swh_indexer::fossology_license::config')
 
   $task_modules = ['swh.indexer.tasks']
   $task_queues = ['swh_indexer_content_fossology_license']
 
-  ::profile::swh::deploy::worker::instance {'swh_indexer_fossology_license':
+  Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_fossology_license':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
       Class['profile::swh::deploy::indexer'],
       Class['profile::swh::deploy::objstorage_cloud'],
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhdev',
     # Contains passwords
     mode    => '0640',
     content => inline_template("<%= @config.to_yaml %>\n"),
   }
 }
diff --git a/manifests/swh/deploy/worker/swh_indexer_language.pp b/manifests/swh/deploy/worker/swh_indexer_language.pp
index c686bc6..de4bc02 100644
--- a/manifests/swh/deploy/worker/swh_indexer_language.pp
+++ b/manifests/swh/deploy/worker/swh_indexer_language.pp
@@ -1,38 +1,38 @@
 # Deployment for swh-indexer-language
 
 class profile::swh::deploy::worker::swh_indexer_language {
   include ::profile::swh::deploy::indexer
 
   $concurrency = lookup('swh::deploy::worker::swh_indexer::language::concurrency')
   $loglevel = lookup('swh::deploy::worker::swh_indexer::language::loglevel')
   $task_broker = lookup('swh::deploy::worker::swh_indexer::language::task_broker')
 
   $config_file = '/etc/softwareheritage/indexer/language.yml'
   $config = lookup('swh::deploy::worker::swh_indexer::language::config')
 
   $task_modules = ['swh.indexer.tasks']
   $task_queues = ['swh_indexer_content_language']
 
-  ::profile::swh::deploy::worker::instance {'swh_indexer_language':
+  Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_language':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
       Class['profile::swh::deploy::indexer'],
       Class['profile::swh::deploy::objstorage_cloud'],
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhdev',
     # Contains passwords
     mode    => '0640',
     content => inline_template("<%= @config.to_yaml %>\n"),
   }
 }
diff --git a/manifests/swh/deploy/worker/swh_indexer_mimetype.pp b/manifests/swh/deploy/worker/swh_indexer_mimetype.pp
index 2cfca53..79c001a 100644
--- a/manifests/swh/deploy/worker/swh_indexer_mimetype.pp
+++ b/manifests/swh/deploy/worker/swh_indexer_mimetype.pp
@@ -1,38 +1,38 @@
 # Deployment for swh-indexer-mimetype
 
 class profile::swh::deploy::worker::swh_indexer_mimetype {
   include ::profile::swh::deploy::indexer
 
   $concurrency = lookup('swh::deploy::worker::swh_indexer::mimetype::concurrency')
   $loglevel = lookup('swh::deploy::worker::swh_indexer::mimetype::loglevel')
   $task_broker = lookup('swh::deploy::worker::swh_indexer::mimetype::task_broker')
 
   $config_file = '/etc/softwareheritage/indexer/mimetype.yml'
   $config = lookup('swh::deploy::worker::swh_indexer::mimetype::config')
 
   $task_modules = ['swh.indexer.tasks']
   $task_queues = ['swh_indexer_content_mimetype']
 
-  ::profile::swh::deploy::worker::instance {'swh_indexer_mimetype':
+  Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_mimetype':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
       Class['profile::swh::deploy::indexer'],
       Class['profile::swh::deploy::objstorage_cloud'],
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhdev',
     # Contains passwords
     mode    => '0640',
     content => inline_template("<%= @config.to_yaml %>\n"),
   }
 }
diff --git a/manifests/swh/deploy/worker/swh_indexer_orchestrator.pp b/manifests/swh/deploy/worker/swh_indexer_orchestrator.pp
index 4c0852f..ade2f8e 100644
--- a/manifests/swh/deploy/worker/swh_indexer_orchestrator.pp
+++ b/manifests/swh/deploy/worker/swh_indexer_orchestrator.pp
@@ -1,37 +1,37 @@
 # Deployment for swh-indexer
 
 class profile::swh::deploy::worker::swh_indexer_orchestrator {
 
   include ::profile::swh::deploy::indexer
 
   $concurrency = lookup('swh::deploy::worker::swh_indexer::orchestrator::concurrency')
   $loglevel = lookup('swh::deploy::worker::swh_indexer::orchestrator::loglevel')
   $task_broker = lookup('swh::deploy::worker::swh_indexer::orchestrator::task_broker')
 
   $config_file = '/etc/softwareheritage/indexer/orchestrator.yml'
   $config = lookup('swh::deploy::worker::swh_indexer::orchestrator::config')
 
   $task_modules = ['swh.indexer.tasks']
   $task_queues = ['swh_indexer_orchestrator_content_all']
 
-  ::profile::swh::deploy::worker::instance {'swh_indexer_orchestrator':
+  Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_orchestrator':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
       Class['profile::swh::deploy::indexer'],
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhworker',
     mode    => '0644',
     content => inline_template("<%= @config.to_yaml %>\n"),
   }
 }
diff --git a/manifests/swh/deploy/worker/swh_indexer_orchestrator_text.pp b/manifests/swh/deploy/worker/swh_indexer_orchestrator_text.pp
index dbf5226..a6a288d 100644
--- a/manifests/swh/deploy/worker/swh_indexer_orchestrator_text.pp
+++ b/manifests/swh/deploy/worker/swh_indexer_orchestrator_text.pp
@@ -1,37 +1,37 @@
 # Deployment for swh-indexer
 
 class profile::swh::deploy::worker::swh_indexer_orchestrator_text {
 
   include ::profile::swh::deploy::indexer
 
   $concurrency = lookup('swh::deploy::worker::swh_indexer::orchestrator_text::concurrency')
   $loglevel = lookup('swh::deploy::worker::swh_indexer::orchestrator_text::loglevel')
   $task_broker = lookup('swh::deploy::worker::swh_indexer::orchestrator_text::task_broker')
 
   $config_file = '/etc/softwareheritage/indexer/orchestrator_text.yml'
   $config = lookup('swh::deploy::worker::swh_indexer::orchestrator_text::config')
 
   $task_modules = ['swh.indexer.tasks']
   $task_queues = ['swh_indexer_orchestrator_content_text']
 
-  ::profile::swh::deploy::worker::instance {'swh_indexer_orchestrator_text':
+  Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_orchestrator_text':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
       Class['profile::swh::deploy::indexer'],
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhworker',
     mode    => '0644',
     content => inline_template("<%= @config.to_yaml %>\n"),
   }
 }
diff --git a/manifests/swh/deploy/worker/swh_indexer_rehash.pp b/manifests/swh/deploy/worker/swh_indexer_rehash.pp
index d01040c..ed5d0a1 100644
--- a/manifests/swh/deploy/worker/swh_indexer_rehash.pp
+++ b/manifests/swh/deploy/worker/swh_indexer_rehash.pp
@@ -1,38 +1,38 @@
 # Deployment for swh-indexer-rehash
 
 class profile::swh::deploy::worker::swh_indexer_rehash {
   include ::profile::swh::deploy::indexer
 
   $concurrency = lookup('swh::deploy::worker::swh_indexer::rehash::concurrency')
   $loglevel = lookup('swh::deploy::worker::swh_indexer::rehash::loglevel')
   $task_broker = lookup('swh::deploy::worker::swh_indexer::rehash::task_broker')
 
   $config_file = '/etc/softwareheritage/indexer/rehash.yml'
   $config = lookup('swh::deploy::worker::swh_indexer::rehash::config')
 
   $task_modules = ['swh.indexer.tasks']
   $task_queues = ['swh_indexer_content_rehash']
 
-  ::profile::swh::deploy::worker::instance {'swh_indexer_rehash':
+  Package[$::profile::swh::deploy::indexer::packages] ~> ::profile::swh::deploy::worker::instance {'swh_indexer_rehash':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
       Class['profile::swh::deploy::indexer'],
       Class['profile::swh::deploy::objstorage_cloud'],
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhdev',
     # Contains passwords
     mode    => '0640',
     content => inline_template("<%= @config.to_yaml %>\n"),
   }
 }