diff --git a/app/jobs/batch_operation_enqueue_all_job.rb b/app/jobs/batch_operation_enqueue_all_job.rb
index 3b54879f8..f99d7a79d 100644
--- a/app/jobs/batch_operation_enqueue_all_job.rb
+++ b/app/jobs/batch_operation_enqueue_all_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BatchOperationEnqueueAllJob < ApplicationJob
-  queue_as :mailers # hotfix
+  queue_as :critical
 
   def perform(batch_operation)
     batch_operation.enqueue_all
diff --git a/app/jobs/batch_operation_process_one_job.rb b/app/jobs/batch_operation_process_one_job.rb
index 04c18353a..102b27a76 100644
--- a/app/jobs/batch_operation_process_one_job.rb
+++ b/app/jobs/batch_operation_process_one_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class BatchOperationProcessOneJob < ApplicationJob
-  queue_as :mailers # hotfix
+  queue_as :critical
   retry_on StandardError, attempts: 1 # default 5, for now no retryable behavior
 
   def perform(batch_operation, dossier)
diff --git a/app/jobs/cron/cron_job.rb b/app/jobs/cron/cron_job.rb
index 2124474a4..7ca5e04e6 100644
--- a/app/jobs/cron/cron_job.rb
+++ b/app/jobs/cron/cron_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Cron::CronJob < ApplicationJob
-  queue_as :cron
+  queue_as :default
   class_attribute :schedule_expression
 
   class << self
diff --git a/app/jobs/dossier_index_search_terms_job.rb b/app/jobs/dossier_index_search_terms_job.rb
index 884506eae..dc0079a5a 100644
--- a/app/jobs/dossier_index_search_terms_job.rb
+++ b/app/jobs/dossier_index_search_terms_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class DossierIndexSearchTermsJob < ApplicationJob
-  queue_as :low_priority
+  queue_as :low
 
   discard_on ActiveRecord::RecordNotFound
 
diff --git a/app/jobs/dossier_operation_log_move_to_cold_storage_batch_job.rb b/app/jobs/dossier_operation_log_move_to_cold_storage_batch_job.rb
index f9c48faa2..d2fb60224 100644
--- a/app/jobs/dossier_operation_log_move_to_cold_storage_batch_job.rb
+++ b/app/jobs/dossier_operation_log_move_to_cold_storage_batch_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class DossierOperationLogMoveToColdStorageBatchJob < ApplicationJob
-  queue_as :low_priority
+  queue_as :low
 
   def perform(ids)
     DossierOperationLog.where(id: ids)
diff --git a/app/jobs/dossier_rebase_job.rb b/app/jobs/dossier_rebase_job.rb
index a6e8a3286..2ca0eb8c9 100644
--- a/app/jobs/dossier_rebase_job.rb
+++ b/app/jobs/dossier_rebase_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class DossierRebaseJob < ApplicationJob
-  queue_as :low_priority # they are massively enqueued, so don't interfere with others especially antivirus
+  queue_as :low # they are massively enqueued, so don't interfere with others especially antivirus
 
   # If by the time the job runs the Dossier has been deleted, ignore the rebase
   discard_on ActiveRecord::RecordNotFound
diff --git a/app/jobs/helpscout_create_conversation_job.rb b/app/jobs/helpscout_create_conversation_job.rb
index 675bfa23d..61b55bcaa 100644
--- a/app/jobs/helpscout_create_conversation_job.rb
+++ b/app/jobs/helpscout_create_conversation_job.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class HelpscoutCreateConversationJob < ApplicationJob
-  queue_as :default
-
   class FileNotScannedYetError < StandardError
   end
 
diff --git a/app/jobs/procedure_sva_svr_process_dossier_job.rb b/app/jobs/procedure_sva_svr_process_dossier_job.rb
index 619ebc568..48a8d7634 100644
--- a/app/jobs/procedure_sva_svr_process_dossier_job.rb
+++ b/app/jobs/procedure_sva_svr_process_dossier_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class ProcedureSVASVRProcessDossierJob < ApplicationJob
-  queue_as :sva
+  queue_as :critical
 
   def perform(dossier)
     dossier.process_sva_svr!
diff --git a/app/jobs/web_hook_job.rb b/app/jobs/web_hook_job.rb
index 32e8ab3bb..40b37c837 100644
--- a/app/jobs/web_hook_job.rb
+++ b/app/jobs/web_hook_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class WebHookJob < ApplicationJob
-  queue_as :webhooks_v1
+  queue_as :default
 
   TIMEOUT = 10