diff --git a/manifests/swh/deploy/scheduler.pp b/manifests/swh/deploy/scheduler.pp
index 127aeeb0..a39fd69e 100644
--- a/manifests/swh/deploy/scheduler.pp
+++ b/manifests/swh/deploy/scheduler.pp
@@ -1,97 +1,116 @@
 # Deployment of swh-scheduler related utilities
 class profile::swh::deploy::scheduler {
   $conf_file = hiera('swh::deploy::scheduler::conf_file')
   $user = hiera('swh::deploy::scheduler::user')
   $group = hiera('swh::deploy::scheduler::group')
   $database = hiera('swh::deploy::scheduler::database')
 
   $task_broker = hiera('swh::deploy::scheduler::task_broker')
   $task_packages = hiera('swh::deploy::scheduler::task_packages')
   $task_modules = hiera('swh::deploy::scheduler::task_modules')
 
   include ::systemd
 
   $listener_service_name = 'swh-scheduler-listener'
   $listener_service_file = "/etc/systemd/system/${listener_service_name}.service"
   $listener_service_template = "profile/swh/deploy/scheduler/${listener_service_name}.service.erb"
 
   $runner_service_name = 'swh-scheduler-runner'
   $runner_service_file = "/etc/systemd/system/${runner_service_name}.service"
   $runner_service_template = "profile/swh/deploy/scheduler/${runner_service_name}.service.erb"
 
   $worker_conf_file = '/etc/softwareheritage/worker.ini'
 
+  $packages = ['python3-swh.scheduler']
   $services = [$listener_service_name, $runner_service_name]
 
-  package {'python3-swh.scheduler':
+  package {$packages:
     ensure => installed,
     notify => Service[$services],
   }
 
   package {$task_packages:
     ensure => installed,
-    notify => Service[$services],
-  }
+    notify => Service[$runner_service_name],
+    }
 
   # Template uses variables
   #  - $database
   #
   file {$conf_file:
     ensure  => present,
     owner   => 'root',
     group   => $group,
     mode    => '0640',
     content => template('profile/swh/deploy/scheduler/scheduler.ini.erb'),
     notify  => Service[$services],
   }
 
   # Template uses variables
   #  - $task_broker
   #  - $task_modules
   #
   file {$worker_conf_file:
     ensure  => present,
     owner   => 'root',
     group   => $group,
     mode    => '0640',
     content => template('profile/swh/deploy/scheduler/worker.ini.erb'),
     notify  => Service[$runner_service_name],
   }
 
   # Template uses variables
   #  - $user
   #  - $group
   #
   file {$listener_service_file:
     ensure  => present,
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
     content => template($listener_service_template),
     notify  => [
       Exec['systemd-daemon-reload'],
       Service[$listener_service_name],
     ],
   }
 
   # Template uses variables
   #  - $user
   #  - $group
   #
   file {$runner_service_file:
     ensure  => present,
     owner   => 'root',
     group   => 'root',
     mode    => '0644',
     content => template($runner_service_template),
     notify  => [
       Exec['systemd-daemon-reload'],
       Service[$runner_service_name],
     ],
   }
 
-  service {$services:
-    ensure => running,
-    enable => true,
+  service {$runner_service_name:
+    ensure  => running,
+    enable  => true,
+    require => [
+      Package[$packages],
+      Package[$task_packages],
+      File[$conf_file],
+      File[$worker_conf_file],
+      File[$runner_service_file],
+    ],
+  }
+
+  service {$listener_service_name:
+    ensure  => running,
+    enable  => true,
+    require => [
+      Package[$packages],
+      File[$conf_file],
+      File[$worker_conf_file],
+      File[$listener_service_file],
+    ],
   }
 }