diff --git a/app/jobs/virus_scanner_job.rb b/app/jobs/virus_scanner_job.rb
index 99b2175af..9cf005e00 100644
--- a/app/jobs/virus_scanner_job.rb
+++ b/app/jobs/virus_scanner_job.rb
@@ -1,4 +1,6 @@
 class VirusScannerJob < ApplicationJob
+  queue_as :active_storage_analysis
+
   discard_on ActiveRecord::RecordNotFound
 
   def perform(blob)
diff --git a/config/application.rb b/config/application.rb
index 0c6d8ea18..d0d95339e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -11,12 +11,16 @@ Dotenv::Railtie.load
 
 module TPS
   class Application < Rails::Application
-    config.load_defaults 5.1
+    config.load_defaults 6.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
+    # The default autoloader since Rails 6.0 defaults is zeitwerk.
+    # However, to split the work, we will move to zeitwerk only in a future PR.
+    config.autoloader = :classic
+
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     config.time_zone = 'Paris'
diff --git a/config/initializers/new_framework_defaults_6_0.rb b/config/initializers/new_framework_defaults_6_0.rb
deleted file mode 100644
index 92240ef5f..000000000
--- a/config/initializers/new_framework_defaults_6_0.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# Be sure to restart your server when you modify this file.
-#
-# This file contains migration options to ease your Rails 6.0 upgrade.
-#
-# Once upgraded flip defaults one by one to migrate to the new default.
-#
-# Read the Guide for Upgrading Ruby on Rails for more info on each option.
-
-# Don't force requests from old versions of IE to be UTF-8 encoded.
-# Rails.application.config.action_view.default_enforce_utf8 = false
-
-# Embed purpose and expiry metadata inside signed and encrypted
-# cookies for increased security.
-#
-# This option is not backwards compatible with earlier Rails versions.
-# It's best enabled when your entire app is migrated and stable on 6.0.
-# Rails.application.config.action_dispatch.use_cookies_with_metadata = true
-
-# Change the return value of `ActionDispatch::Response#content_type` to Content-Type header without modification.
-# Rails.application.config.action_dispatch.return_only_media_type_on_content_type = false
-
-# Return false instead of self when enqueuing is aborted from a callback.
-# Rails.application.config.active_job.return_false_on_aborted_enqueue = true
-
-# Send Active Storage analysis and purge jobs to dedicated queues.
-# Rails.application.config.active_storage.queues.analysis = :active_storage_analysis
-# Rails.application.config.active_storage.queues.purge    = :active_storage_purge
-
-# When assigning to a collection of attachments declared via `has_many_attached`, replace existing
-# attachments instead of appending. Use #attach to add new attachments without replacing existing ones.
-# Rails.application.config.active_storage.replace_on_assign_to_many = true
-
-# Use ActionMailer::MailDeliveryJob for sending parameterized and normal mail.
-#
-# The default delivery jobs (ActionMailer::Parameterized::DeliveryJob, ActionMailer::DeliveryJob),
-# will be removed in Rails 6.1. This setting is not backwards compatible with earlier Rails versions.
-# If you send mail in the background, job workers need to have a copy of
-# MailDeliveryJob to ensure all delivery jobs are processed properly.
-# Make sure your entire app is migrated and stable on 6.0 before using this setting.
-# Rails.application.config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
-
-# Enable the same cache key to be reused when the object being cached of type
-# `ActiveRecord::Relation` changes by moving the volatile information (max updated at and count)
-# of the relation's cache key into the cache version to support recycling cache key.
-# Rails.application.config.active_record.collection_cache_versioning = true
diff --git a/spec/controllers/instructeurs/procedures_controller_spec.rb b/spec/controllers/instructeurs/procedures_controller_spec.rb
index d32d7dffa..7e5f2e561 100644
--- a/spec/controllers/instructeurs/procedures_controller_spec.rb
+++ b/spec/controllers/instructeurs/procedures_controller_spec.rb
@@ -540,8 +540,8 @@ describe Instructeurs::ProceduresController, type: :controller do
           format: :js
       end
 
-      it "responses in the correct format" do
-        expect(response.content_type).to eq "text/javascript"
+      it 'responds in the correct format' do
+        expect(response.media_type).to eq('text/javascript')
         expect(response).to have_http_status(:ok)
       end
     end
diff --git a/spec/controllers/new_administrateur/attestation_templates_controller_spec.rb b/spec/controllers/new_administrateur/attestation_templates_controller_spec.rb
index 83079adc6..4e50739e9 100644
--- a/spec/controllers/new_administrateur/attestation_templates_controller_spec.rb
+++ b/spec/controllers/new_administrateur/attestation_templates_controller_spec.rb
@@ -23,7 +23,7 @@ describe NewAdministrateur::AttestationTemplatesController, type: :controller do
     render_views
     it 'renders a PDF' do
       expect(subject.status).to eq(200)
-      expect(subject.content_type).to eq('application/pdf')
+      expect(subject.media_type).to eq('application/pdf')
     end
   end