diff --git a/manifests/swh/deploy/base_loader_git.pp b/manifests/swh/deploy/base_loader_git.pp
new file mode 100644
index 0000000..aabfbfa
--- /dev/null
+++ b/manifests/swh/deploy/base_loader_git.pp
@@ -0,0 +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',
+  }
+
+}
diff --git a/manifests/swh/deploy/worker/swh_loader_git.pp b/manifests/swh/deploy/worker/swh_loader_git.pp
index 12fcf52..4f15c04 100644
--- a/manifests/swh/deploy/worker/swh_loader_git.pp
+++ b/manifests/swh/deploy/worker/swh_loader_git.pp
@@ -1,42 +1,35 @@
 # Deployment for swh-loader-git
 class profile::swh::deploy::worker::swh_loader_git {
-
-  include ::profile::swh::deploy::loader
+  include ::profile::swh::deploy::base_loader_git
 
   $concurrency = hiera('swh::deploy::worker::swh_loader_git::concurrency')
   $loglevel = hiera('swh::deploy::worker::swh_loader_git::loglevel')
   $task_broker = hiera('swh::deploy::worker::swh_loader_git::task_broker')
 
   $config_file = '/etc/softwareheritage/loader/git-updater.yml'
   $config = hiera('swh::deploy::worker::swh_loader_git::config')
 
   $task_modules = ['swh.loader.git.tasks']
   $task_queues = ['swh_loader_git']
 
-  $packages = ['python3-swh.loader.git']
-
-  package {$packages:
-    ensure => 'installed',
-  }
-
   ::profile::swh::deploy::worker::instance {'swh_loader_git':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
-      Package[$packages],
+      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 %>'),
   }
 }
diff --git a/manifests/swh/deploy/worker/swh_reader_git.pp b/manifests/swh/deploy/worker/swh_reader_git.pp
index 92b6914..9fec091 100644
--- a/manifests/swh/deploy/worker/swh_reader_git.pp
+++ b/manifests/swh/deploy/worker/swh_reader_git.pp
@@ -1,42 +1,37 @@
 # Deployment for swh-reader-git
 class profile::swh::deploy::worker::swh_reader_git {
-  include ::profile::swh::deploy::loader
+  include ::profile::swh::deploy::base_loader_git
   include ::profile::swh::deploy::worker::swh_storage_archiver_azure
 
   $concurrency = hiera('swh::deploy::worker::swh_reader_git::concurrency')
   $loglevel = hiera('swh::deploy::worker::swh_reader_git::loglevel')
   $task_broker = hiera('swh::deploy::worker::swh_reader_git::task_broker')
 
   $config_file = '/etc/softwareheritage/loader/git-remote-reader.yml'
   $config = hiera('swh::deploy::worker::swh_reader_git::config')
 
   $task_modules = ['swh.loader.git.tasks']
   $task_queues = ['swh_reader_git']
 
-  $packages = ['python3-swh.loader.git']
-
-  package {$packages:
-    ensure => 'installed',
-  }
-
   ::profile::swh::deploy::worker::instance {'swh_reader_git':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
-      Package[$packages],
+      Class['profile::swh::deploy::base_loader_git'],
+      Class['profile::swh::deploy::worker::swh_storage_archiver_azure'],
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhworker',
     mode    => '0644',
     content => inline_template('<%= @config.to_yaml %>'),
   }
 }