diff --git a/site-modules/profile/manifests/swh/deploy/worker/instance.pp b/site-modules/profile/manifests/swh/deploy/worker/instance.pp
index 8be5dd3b..b3820880 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/instance.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/instance.pp
@@ -1,111 +1,121 @@
 # Instance of a worker
 
 # @param send_task_events
 #   True for workers whose tasks are still scheduled with scheduler-runner (they need to
 #   report their status to the listener which updates the scheduler accordingly).
 #   False, the default, for other workers whose recurring tasks are scheduled with
 #   next-gen scheduler-runner. Their status are updated through a journal client so no
 #   need for the events.
+# @param sentry_setup
+#   True, the default will extract the sentry configuration if any to make workers push
+#   their issues to sentry. Define it to false if for some reason, this cannot work.
 # @param extra_config
 #   Extra configuration dict to merge into the default $config loaded for the service.
 #   Typically, that'd be needed to provide extra sensible information like credentials.
 define profile::swh::deploy::worker::instance (
-  $ensure = present,
-  $instance_name = $title,
-  $sentry_name = $title,
-  $limit_no_file = undef,
-  $private_tmp = undef,
-  $merge_policy = 'deep',
-  $send_task_events = false,
+  $ensure                         = present,
+  $instance_name                  = $title,
+  $sentry_name                    = $title,
+  $limit_no_file                  = undef,
+  $private_tmp                    = undef,
+  $merge_policy                   = 'deep',
+  $send_task_events               = false,
+  $sentry_setup                   = true,
   Hash[String, Any] $extra_config = {},
 )
 {
   include ::profile::swh::deploy::worker::base
 
   # Parametrize the celery worker to actually send task events if required
   if $send_task_events {
     $celery_worker_extra_args = "--events"
   } else {
     $celery_worker_extra_args = ""
   }
 
   $service_basename = "swh-worker@${instance_name}"
   $service_name = "${service_basename}.service"
   $concurrency = lookup("swh::deploy::worker::${instance_name}::concurrency")
   $max_tasks_per_child = lookup("swh::deploy::worker::${instance_name}::max_tasks_per_child", Integer, first, 5)
   $loglevel = lookup("swh::deploy::worker::${instance_name}::loglevel")
   $config_file = lookup("swh::deploy::worker::${instance_name}::config_file")
   # Merge the default $config with $extra_config (if any)
   $config = deep_merge(
     lookup("swh::deploy::worker::${instance_name}::config", Hash, $merge_policy),
     $extra_config
   )
 
-  $sentry_dsn = lookup("swh::deploy::${sentry_name}::sentry_dsn", Optional[String], 'first', undef)
-  $sentry_environment = lookup("swh::deploy::${sentry_name}::sentry_environment", Optional[String], 'first', undef)
-  $sentry_swh_package = lookup("swh::deploy::${sentry_name}::sentry_swh_package", Optional[String], 'first', undef)
+  if $sentry_setup {
+    $sentry_dsn = lookup("swh::deploy::${sentry_name}::sentry_dsn", Optional[String], 'first', undef)
+    $sentry_environment = lookup("swh::deploy::${sentry_name}::sentry_environment", Optional[String], 'first', undef)
+    $sentry_swh_package = lookup("swh::deploy::${sentry_name}::sentry_swh_package", Optional[String], 'first', undef)
+  } else {
+    $sentry_dsn = undef
+    $sentry_environment = undef
+    $sentry_swh_package = undef
+  }
 
   $celery_hostname = $::profile::swh::deploy::worker::base::celery_hostname
 
   $parameters_conf = "${service_basename}/parameters.conf"
   case $ensure {
     'present', 'running': {
       # Uses variables
       # - $concurrency
       # - $loglevel
       # - $max_tasks_per_child
       # - $celery_hostname
       # - $sentry_{dsn,environment,swh_package}
       ::systemd::dropin_file {$parameters_conf:
         ensure   => present,
         unit     => $service_name,
         filename => 'parameters.conf',
         content  => template('profile/swh/deploy/worker/parameters.conf.erb'),
       }
 
       file {$config_file:
         ensure  => 'present',
         owner   => 'swhworker',
         group   => 'swhworker',
         mode    => '0640',
         content => inline_template("<%= @config.to_yaml %>\n"),
       }
 
       if $ensure == 'running' {
         $service_ensure = 'running'
       } else {
         $service_ensure = undef
       }
 
       service {$service_basename:
         ensure  => $service_ensure,
         enable  => true,
         require => [
           File[$config_file],
         ]
       }
 
       profile::cron::d {"swh-worker-${instance_name}-autorestart":
         command => "chronic /usr/local/sbin/swh-worker-ping-restart ${instance_name}@${celery_hostname} ${instance_name}",
         target  => 'swh-worker',
         minute  => 'fqdn_rand/15',
         require => File['/usr/local/sbin/swh-worker-ping-restart'],
       }
     }
     default: {
       ::systemd::dropin_file {$parameters_conf:
         ensure   => absent,
         unit     => $service_name,
         filename => 'parameters.conf',
       }
 
       service {$service_basename:
         ensure  => stopped,
       }
 
       file {$config_file:
         ensure  => absent,
       }
     }
   }
 }
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
index 0fa41083..8abc2b49 100644
--- a/site-modules/profile/manifests/swh/deploy/worker/loader_high_priority.pp
+++ b/site-modules/profile/manifests/swh/deploy/worker/loader_high_priority.pp
@@ -1,16 +1,19 @@
 # Deployment for high priority loader
 class profile::swh::deploy::worker::loader_high_priority {
   include ::profile::swh::deploy::base_loader_git
   include ::profile::swh::deploy::base_loader_mercurial
   include ::profile::swh::deploy::base_loader_svn
 
   $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_high_priority':
     ensure            => present,
     send_task_events  => true,
     require           => Package[$packages],
     extra_config      => $::profile::swh::deploy::base_loader_git::extra_config,
+    # We need to work on the sentry scaffolding for workers with miscellaneous task types
+    # https://forge.softwareheritage.org/T4513
+    sentry_setup      => false,
   }
 
 }