diff --git a/site-modules/profile/manifests/swh/deploy/base_loader_git.pp b/site-modules/profile/manifests/swh/deploy/base_loader_git.pp
--- a/site-modules/profile/manifests/swh/deploy/base_loader_git.pp
+++ b/site-modules/profile/manifests/swh/deploy/base_loader_git.pp
@@ -2,10 +2,20 @@
 class profile::swh::deploy::base_loader_git {
   include ::profile::swh::deploy::loader
 
+  $load_metadata = lookup('swh::deploy::worker::loader_git::load_metadata')
   $packages = ['python3-swh.loader.git']
 
-  package {$packages:
-    ensure => 'present',
+  if $load_metadata {
+    $extra_config = lookup('swh::deploy::worker::loader_git::extra_config', {
+      default_value => {}
+    })
+    $extra_packages = ['python3-swh.loader.metadata']
+    ensure_packages($extra_packages)
+    $all_packages = $packages + $extra_packages
+  } else {
+    $extra_config = {}
   }
 
+  ensure_packages($packages)
+
 }
diff --git a/site-modules/profile/manifests/swh/deploy/worker/loader_git.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_git.pp
--- a/site-modules/profile/manifests/swh/deploy/worker/loader_git.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/loader_git.pp
@@ -2,24 +2,9 @@
 class profile::swh::deploy::worker::loader_git {
   include ::profile::swh::deploy::base_loader_git
 
-  $load_metadata = lookup('swh::deploy::worker::loader_git::load_metadata')
-  $packages = [$::profile::swh::deploy::base_loader_git::packages]
-
-  if $load_metadata {
-    $extra_config = lookup('swh::deploy::worker::loader_git::extra_config', {
-      default_value => {}
-    })
-    $extra_packages = ['python3-swh.loader.metadata']
-    ensure_packages($extra_packages)
-    $all_packages = $packages + $extra_packages
-  } else {
-    $extra_config = {}
-    $all_packages = $packages
-  }
-
   ::profile::swh::deploy::worker::instance {'loader_git':
     ensure       => present,
-    require      => Package[$all_packages],
-    extra_config => $extra_config
+    require      => Package[$::profile::swh::deploy::base_loader_git::packages],
+    extra_config => $::profile::swh::deploy::base_loader_git::extra_config
   }
 }
diff --git a/site-modules/profile/manifests/swh/deploy/worker/loader_high_priority.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_high_priority.pp
--- a/site-modules/profile/manifests/swh/deploy/worker/loader_high_priority.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/loader_high_priority.pp
@@ -10,6 +10,7 @@
     ensure            => present,
     send_task_events  => true,
     require           => Package[$packages],
+    extra_config      => $::profile::swh::deploy::base_loader_git::extra_config,
   }
 
 }
diff --git a/site-modules/profile/manifests/swh/deploy/worker/loader_oneshot.pp b/site-modules/profile/manifests/swh/deploy/worker/loader_oneshot.pp
--- a/site-modules/profile/manifests/swh/deploy/worker/loader_oneshot.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/loader_oneshot.pp
@@ -7,8 +7,9 @@
   $packages = $::profile::swh::deploy::base_loader_git::packages + $::profile::swh::deploy::base_loader_mercurial::packages + $::profile::swh::deploy::base_loader_svn::packages
 
   ::profile::swh::deploy::worker::instance {'loader_oneshot':
-    ensure  => present,
-    require => Package[$packages],
+    ensure       => present,
+    require      => Package[$packages],
+    extra_config => $::profile::swh::deploy::base_loader_git::extra_config,
   }
 
 }