diff --git a/manifests/swh/deploy/base_loader_git.pp b/manifests/swh/deploy/base_loader_git.pp
index aabfbfaa..51258674 100644
--- a/manifests/swh/deploy/base_loader_git.pp
+++ b/manifests/swh/deploy/base_loader_git.pp
@@ -1,12 +1,12 @@
 # Git Loader base configuration
 
 class profile::swh::deploy::base_loader_git {
   include ::profile::swh::deploy::loader
 
   $packages = ['python3-swh.loader.git']
 
   package {$packages:
-    ensure => 'installed',
+    ensure => 'latest',
   }
 
 }
diff --git a/manifests/swh/deploy/worker/swh_loader_git_disk.pp b/manifests/swh/deploy/worker/swh_loader_git_disk.pp
index bd09814c..e4dc1574 100644
--- a/manifests/swh/deploy/worker/swh_loader_git_disk.pp
+++ b/manifests/swh/deploy/worker/swh_loader_git_disk.pp
@@ -1,35 +1,39 @@
 # Deployment for swh-loader-git (disk)
 class profile::swh::deploy::worker::swh_loader_git_disk {
   include ::profile::swh::deploy::base_loader_git
 
   $concurrency = hiera('swh::deploy::worker::swh_loader_git_disk::concurrency')
   $loglevel = hiera('swh::deploy::worker::swh_loader_git_disk::loglevel')
   $task_broker = hiera('swh::deploy::worker::swh_loader_git_disk::task_broker')
 
   $config_file = '/etc/softwareheritage/loader/git-loader.yml'
   $config = hiera('swh::deploy::worker::swh_loader_git_disk::config')
 
   $task_modules = ['swh.loader.git.tasks']
   $task_queues = ['swh_loader_git_express', 'swh_loader_git_archive']
 
-  ::profile::swh::deploy::worker::instance {'swh_loader_git_disk':
-    ensure       => present,
+  $service_name = 'swh_loader_git_disk'
+
+  Package[$::profile::swh::deploy::base_loader_git::packages] ~> Service["swh-worker@$service_name"]
+
+  ::profile::swh::deploy::worker::instance {$service_name:
+    ensure       => running,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
       Class['profile::swh::deploy::base_loader_git'],
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhworker',
     mode    => '0644',
     content => inline_template("<%= @config.to_yaml %>\n"),
   }
 }