diff --git a/manifests/swh/deploy/worker/swh_storage_archiver.pp b/manifests/swh/deploy/worker/swh_storage_archiver.pp
index 118d6dc..a7713f2 100644
--- a/manifests/swh/deploy/worker/swh_storage_archiver.pp
+++ b/manifests/swh/deploy/worker/swh_storage_archiver.pp
@@ -1,38 +1,38 @@
 # Deployment for swh-storage-archiver
 class profile::swh::deploy::worker::swh_storage_archiver {
   include ::profile::swh::deploy::archiver
 
   $concurrency = hiera('swh::deploy::worker::swh_storage_archiver::concurrency')
   $loglevel = hiera('swh::deploy::worker::swh_storage_archiver::loglevel')
   $task_broker = hiera('swh::deploy::worker::swh_storage_archiver::task_broker')
 
   $config_file = hiera('swh::deploy::worker::swh_storage_archiver::conf_file')
   $config = hiera('swh::deploy::worker::swh_storage_archiver::config')
 
   $storages_config = hiera_array('swh::deploy::worker::swh_storage_archiver::storages')
   $merged_config = merge($config, {'storages' => $storages_config})
 
   $task_modules = ['swh.storage.archiver.tasks']
-  $task_queues = ['swh_storage_archiver_worker']
+  $task_queues = ['swh_storage_archive_worker']
 
   ::profile::swh::deploy::worker::instance {'swh_storage_archiver':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhdev',
     # Contains passwords
     mode    => '0640',
     content => inline_template('<%= @merged_config.to_yaml %>'),
   }
 }
diff --git a/manifests/swh/deploy/worker/swh_storage_archiver_azure.pp b/manifests/swh/deploy/worker/swh_storage_archiver_azure.pp
index 15137f2..a2238cd 100644
--- a/manifests/swh/deploy/worker/swh_storage_archiver_azure.pp
+++ b/manifests/swh/deploy/worker/swh_storage_archiver_azure.pp
@@ -1,48 +1,48 @@
 # Deployment for swh-storage-archiver-azure
 class profile::swh::deploy::worker::swh_storage_archiver_azure {
   include ::profile::swh::deploy::archiver
 
   $concurrency = hiera('swh::deploy::worker::swh_storage_archiver_azure::concurrency')
   $loglevel = hiera('swh::deploy::worker::swh_storage_archiver_azure::loglevel')
   $task_broker = hiera('swh::deploy::worker::swh_storage_archiver_azure::task_broker')
 
   $config_file = hiera('swh::deploy::worker::swh_storage_archiver_azure::conf_file')
   $config = hiera('swh::deploy::worker::swh_storage_archiver_azure::config')
 
   $storages_config_list = hiera_array(
     'swh::deploy::worker::swh_storage_archiver::storages')
   $objstorage_azure_config = hiera('swh::azure_objstorage::config')
 
   $objstorages_config = $storages_config_list + [
     merge({"host" => "azure"}, $objstorage_azure_config)
   ]
 
   # Create the full configuration
   $merged_config = merge($config, {
     'storages' => $objstorages_config
   })
 
   $task_modules = ['swh.storage.archiver.tasks']
-  $task_queues = ['swh_storage_archiver_worker_to_backend']
+  $task_queues = ['swh_storage_archive_worker_to_backend']
 
   ::profile::swh::deploy::worker::instance {'swh_storage_archiver_azure':
     ensure       => present,
     concurrency  => $concurrency,
     loglevel     => $loglevel,
     task_broker  => $task_broker,
     task_modules => $task_modules,
     task_queues  => $task_queues,
     require      => [
       File[$config_file],
     ],
   }
 
   file {$config_file:
     ensure  => 'present',
     owner   => 'swhworker',
     group   => 'swhdev',
     # Contains passwords
     mode    => '0640',
     content => inline_template('<%= @merged_config.to_yaml %>'),
   }
 }