diff --git a/Gemfile b/Gemfile
index 7da3cada3..0d67e2d9b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby File.read('.ruby-version')
 
-gem 'rails', '~> 6.1'
+gem 'rails', '~> 7.0.8'
 
 gem 'activerecord-import'
 gem 'auto_strip_attributes'
@@ -76,7 +76,7 @@ group :development do
   gem 'listen'
   gem 'rails-erd'
   gem 'rubocop-govuk'
-  gem 'spring'
+  gem 'spring', '>= 3'
   gem 'spring-watcher-listen'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2ab99739f..b6da1fa16 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,67 +1,73 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actioncable (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionmailbox (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      actionview (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.8)
+      actionpack (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.4)
-      actionview (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actiontext (7.0.8)
+      actionpack (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.4)
-      activesupport (= 6.1.7.4)
-    activerecord (6.1.7.4)
-      activemodel (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
     activerecord-import (1.4.1)
       activerecord (>= 4.2)
-    activestorage (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    activestorage (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activesupport (= 7.0.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.4)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
@@ -174,8 +180,8 @@ GEM
       octokit (~> 4.6)
       rainbow (>= 2.2.1)
       rake (>= 10.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     govuk_notify_rails (2.2.0)
       notifications-ruby-client (~> 5.1)
       rails (>= 4.1.0)
@@ -224,7 +230,7 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.4)
-    minitest (5.19.0)
+    minitest (5.20.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -287,21 +293,20 @@ GEM
       rack (>= 2.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.4)
-      actioncable (= 6.1.7.4)
-      actionmailbox (= 6.1.7.4)
-      actionmailer (= 6.1.7.4)
-      actionpack (= 6.1.7.4)
-      actiontext (= 6.1.7.4)
-      actionview (= 6.1.7.4)
-      activejob (= 6.1.7.4)
-      activemodel (= 6.1.7.4)
-      activerecord (= 6.1.7.4)
-      activestorage (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    rails (7.0.8)
+      actioncable (= 7.0.8)
+      actionmailbox (= 7.0.8)
+      actionmailer (= 7.0.8)
+      actionpack (= 7.0.8)
+      actiontext (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activemodel (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.4)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -314,12 +319,13 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (6.1.7.4)
-      actionpack (= 6.1.7.4)
-      activesupport (= 6.1.7.4)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
@@ -428,17 +434,10 @@ GEM
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    spring (2.1.1)
-    spring-watcher-listen (2.0.1)
+    spring (4.1.1)
+    spring-watcher-listen (2.1.0)
       listen (>= 2.7, < 4.0)
-      spring (>= 1.2, < 3.0)
-    sprockets (4.2.0)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
+      spring (>= 4)
     sync (0.5.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -505,7 +504,7 @@ DEPENDENCIES
   puma
   rack-cors
   rack-test
-  rails (~> 6.1)
+  rails (~> 7.0.8)
   rails-erd
   redis
   routing-filter
@@ -523,7 +522,7 @@ DEPENDENCIES
   sidekiq
   simplecov
   slack-notifier
-  spring
+  spring (>= 3)
   spring-watcher-listen
   terminal-table
   timecop
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 6257ba6d8..6e82a8df6 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -92,7 +92,7 @@ def restricted_request_content_type
   end
 
   def restrict_request_content_type
-    return if request.content_type == restricted_request_content_type || valid_empty_request?
+    return if request.media_type == restricted_request_content_type || valid_empty_request?
 
     render_invalid_media_type_error('Invalid Media Type', "Content-Type must be #{restricted_request_content_type}")
   end
@@ -222,7 +222,7 @@ def validation_errors(record)
 
   # Allow always-bodyless requests (GET, DELETE HEAD) to omit the Content-Type
   def valid_empty_request?
-    request.content_type.nil? && (request.get? || request.delete? || request.head?)
+    request.media_type.nil? && (request.get? || request.delete? || request.head?)
   end
 
   def render_validation_error(exception)
diff --git a/app/models/person.rb b/app/models/person.rb
index 231964ff4..c11c7c3b9 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -53,7 +53,7 @@ def attach_image(image_blob)
     "#{id}.jpg".tap do |filename|
       image_io = StringIO.new(image_blob).binmode
       begin
-        image.attach(io: image_io, filename: filename, content_type: 'image/jpg')
+        image.attach(io: image_io, filename: filename, content_type: 'image/jpeg')
       ensure
         image_io.close
       end
diff --git a/app/services/allocations/create_in_nomis.rb b/app/services/allocations/create_in_nomis.rb
index b43e8c0e4..842186fdf 100644
--- a/app/services/allocations/create_in_nomis.rb
+++ b/app/services/allocations/create_in_nomis.rb
@@ -10,7 +10,7 @@ def self.call(move)
           fromPrisonLocation: move.from_location.nomis_agency_id,
           toPrisonLocation: move.to_location.nomis_agency_id,
           escortType: 'PECS',
-          scheduledMoveDateTime: move.date.to_s(:nomis),
+          scheduledMoveDateTime: move.date.to_fs(:nomis),
         },
       }
 
diff --git a/app/services/court_hearings/create_in_nomis.rb b/app/services/court_hearings/create_in_nomis.rb
index 6d70400ed..e66993c8d 100644
--- a/app/services/court_hearings/create_in_nomis.rb
+++ b/app/services/court_hearings/create_in_nomis.rb
@@ -15,7 +15,7 @@ def self.call(move, court_hearings)
           booking_id: booking_id,
           court_case_id: hearing.nomis_case_id,
           body_params: {
-            courtHearingDateTime: hearing.start_time.to_s(:nomis),
+            courtHearingDateTime: hearing.start_time.to_fs(:nomis),
             comments: hearing.comments,
           }.merge(body_locations),
         }
diff --git a/app/services/encryptor.rb b/app/services/encryptor.rb
index ef8197d0a..01729d007 100644
--- a/app/services/encryptor.rb
+++ b/app/services/encryptor.rb
@@ -6,6 +6,7 @@
 class Encryptor
   KEY = ActiveSupport::KeyGenerator.new(
     Rails.application.secret_key_base,
+    { hash_digest_class: OpenSSL::Digest::SHA1 },
   ).generate_key(
     ENV.fetch('ENCRYPTOR_SALT'),
     ActiveSupport::MessageEncryptor.key_len,
diff --git a/config/application.rb b/config/application.rb
index 9d1229bbc..03d8586b9 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -46,5 +46,8 @@ class Application < Rails::Application
 
     # Needed for PaperTrail to be able to deserialise saved versions
     config.active_record.yaml_column_permitted_classes = [Symbol, Date, Time]
+
+    config.active_support.cache_format_version = 7.0
+    config.active_support.disable_to_s_conversion = true
   end
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 199777dff..29a0c54d5 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -8,7 +8,7 @@
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Do not eager load code on boot. This avoids loading your whole application
   # just for the purpose of running a single test. If you are using a tool that
diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
new file mode 100644
index 000000000..a1a678b5c
--- /dev/null
+++ b/config/initializers/new_framework_defaults_7_0.rb
@@ -0,0 +1,143 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file eases your Rails 7.0 framework defaults upgrade.
+#
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.0`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+# `button_to` view helper will render `<button>` element, regardless of whether
+# or not the content is passed as the first argument or as a block.
+Rails.application.config.action_view.button_to_generates_button_tag = true
+
+# `stylesheet_link_tag` view helper will not render the media attribute by default.
+Rails.application.config.action_view.apply_stylesheet_media_default = false
+
+# Change the digest class for the key generators to `OpenSSL::Digest::SHA256`.
+# Changing this default means invalidate all encrypted messages generated by
+# your application and, all the encrypted cookies. Only change this after you
+# rotated all the messages using the key rotator.
+#
+# See upgrading guide for more information on how to build a rotator.
+# https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html
+Rails.application.config.active_support.key_generator_hash_digest_class = OpenSSL::Digest::SHA256
+
+# Change the digest class for ActiveSupport::Digest.
+# Changing this default means that for example Etags change and
+# various cache keys leading to cache invalidation.
+Rails.application.config.active_support.hash_digest_class = OpenSSL::Digest::SHA256
+
+# Don't override ActiveSupport::TimeWithZone.name and use the default Ruby
+# implementation.
+Rails.application.config.active_support.remove_deprecated_time_with_zone_name = true
+
+# Calls `Rails.application.executor.wrap` around test cases.
+# This makes test cases behave closer to an actual request or job.
+# Several features that are normally disabled in test, such as Active Record query cache
+# and asynchronous queries will then be enabled.
+Rails.application.config.active_support.executor_around_test_case = true
+
+# Set both the `:open_timeout` and `:read_timeout` values for `:smtp` delivery method.
+Rails.application.config.action_mailer.smtp_timeout = 5
+
+# The ActiveStorage video previewer will now use scene change detection to generate
+# better preview images (rather than the previous default of using the first frame
+# of the video).
+Rails.application.config.active_storage.video_preview_arguments =
+  "-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"
+
+# Automatically infer `inverse_of` for associations with a scope.
+Rails.application.config.active_record.automatic_scope_inversing = true
+
+# Raise when running tests if fixtures contained foreign key violations
+Rails.application.config.active_record.verify_foreign_keys_for_fixtures = true
+
+# Disable partial inserts.
+# This default means that all columns will be referenced in INSERT queries
+# regardless of whether they have a default or not.
+Rails.application.config.active_record.partial_inserts = false
+
+# Protect from open redirect attacks in `redirect_back_or_to` and `redirect_to`.
+Rails.application.config.action_controller.raise_on_open_redirects = true
+
+# Change the variant processor for Active Storage.
+# Changing this default means updating all places in your code that
+# generate variants to use image processing macros and ruby-vips
+# operations. See the upgrading guide for detail on the changes required.
+# The `:mini_magick` option is not deprecated; it's fine to keep using it.
+Rails.application.config.active_storage.variant_processor = :vips
+
+# Enable parameter wrapping for JSON.
+# Previously this was set in an initializer. It's fine to keep using that initializer if you've customized it.
+# To disable parameter wrapping entirely, set this config to `false`.
+Rails.application.config.action_controller.wrap_parameters_by_default = true
+
+# Specifies whether generated namespaced UUIDs follow the RFC 4122 standard for namespace IDs provided as a
+# `String` to `Digest::UUID.uuid_v3` or `Digest::UUID.uuid_v5` method calls.
+#
+# See https://guides.rubyonrails.org/configuring.html#config-active-support-use-rfc4122-namespaced-uuids for
+# more information.
+Rails.application.config.active_support.use_rfc4122_namespaced_uuids = true
+
+# Change the default headers to disable browsers' flawed legacy XSS protection.
+Rails.application.config.action_dispatch.default_headers = {
+  "X-Frame-Options" => "SAMEORIGIN",
+  "X-XSS-Protection" => "0",
+  "X-Content-Type-Options" => "nosniff",
+  "X-Download-Options" => "noopen",
+  "X-Permitted-Cross-Domain-Policies" => "none",
+  "Referrer-Policy" => "strict-origin-when-cross-origin"
+}
+
+
+# ** Please read carefully, this must be configured in config/application.rb **
+# Change the format of the cache entry.
+# Changing this default means that all new cache entries added to the cache
+# will have a different format that is not supported by Rails 6.1 applications.
+# Only change this value after your application is fully deployed to Rails 7.0
+# and you have no plans to rollback.
+# When you're ready to change format, add this to `config/application.rb` (NOT this file):
+#  config.active_support.cache_format_version = 7.0
+
+
+# Cookie serializer: 2 options
+#
+# If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer
+# is `:marshal`. The default for new apps is `:json`.
+#
+Rails.application.config.action_dispatch.cookies_serializer = :json
+#
+#
+# To migrate an existing application to the `:json` serializer, use the `:hybrid` option.
+#
+# Rails transparently deserializes existing (Marshal-serialized) cookies on read and
+# re-writes them in the JSON format.
+#
+# It is fine to use `:hybrid` long term; you should do that until you're confident *all* your cookies
+# have been converted to JSON. To keep using `:hybrid` long term, move this config to its own
+# initializer or to `config/application.rb`.
+#
+Rails.application.config.action_dispatch.cookies_serializer = :hybrid
+#
+#
+# If your cookies can't yet be serialized to JSON, keep using `:marshal` for backward-compatibility.
+#
+# If you have configured the serializer elsewhere, you can remove this section of the file.
+#
+# See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information.
+
+# Change the return value of `ActionDispatch::Request#content_type` to the Content-Type header without modification.
+Rails.application.config.action_dispatch.return_only_request_media_type_on_content_type = false
+
+# Active Storage `has_many_attached` relationships will default to replacing the current collection instead of appending to it.
+# Thus, to support submitting an empty collection, the `file_field` helper will render an hidden field `include_hidden` by default when `multiple_file_field_include_hidden` is set to `true`.
+# See https://guides.rubyonrails.org/configuring.html#config-active-storage-multiple-file-field-include-hidden for more information.
+Rails.application.config.active_storage.multiple_file_field_include_hidden = true
+
+# ** Please read carefully, this must be configured in config/application.rb (NOT this file) **
+# Disables the deprecated #to_s override in some Ruby core classes
+# See https://guides.rubyonrails.org/configuring.html#config-active-support-disable-to-s-conversion for more information.
+# config.active_support.disable_to_s_conversion = true
diff --git a/config/initializers/prometheus_metrics.rb b/config/initializers/prometheus_metrics.rb
index 67c032e2f..c85ea3f26 100644
--- a/config/initializers/prometheus_metrics.rb
+++ b/config/initializers/prometheus_metrics.rb
@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
-PrometheusMetrics.instance.configure
+Rails.application.config.to_prepare do
+  PrometheusMetrics.instance.configure
+end
diff --git a/db/migrate/20230920171510_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/db/migrate/20230920171510_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
new file mode 100644
index 000000000..93c8b85ad
--- /dev/null
+++ b/db/migrate/20230920171510_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
@@ -0,0 +1,8 @@
+# This migration comes from active_storage (originally 20211119233751)
+class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
+  def change
+    return unless table_exists?(:active_storage_blobs)
+
+    change_column_null(:active_storage_blobs, :checksum, true)
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f58c2c525..1ab6256fb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,8 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_08_08_150500) do
-
+ActiveRecord::Schema[7.0].define(version: 2023_09_20_171510) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "citext"
   enable_extension "pgcrypto"
@@ -20,7 +19,7 @@
   create_table "access_logs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "request_id"
     t.uuid "idempotency_key"
-    t.datetime "timestamp"
+    t.datetime "timestamp", precision: nil
     t.string "whodunnit"
     t.string "client"
     t.string "verb"
@@ -39,7 +38,7 @@
     t.uuid "record_id", null: false
     t.string "record_type", null: false
     t.uuid "blob_id", null: false
-    t.datetime "created_at", null: false
+    t.datetime "created_at", precision: nil, null: false
     t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
   end
 
@@ -49,8 +48,8 @@
     t.string "content_type"
     t.text "metadata"
     t.bigint "byte_size", null: false
-    t.string "checksum", null: false
-    t.datetime "created_at", null: false
+    t.string "checksum"
+    t.datetime "created_at", precision: nil, null: false
     t.string "service_name", null: false
     t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
   end
@@ -64,8 +63,8 @@
   create_table "allocation_complex_cases", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "key", null: false
     t.string "title", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "allocations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -78,8 +77,8 @@
     t.integer "moves_count", null: false
     t.boolean "complete_in_full", default: false, null: false
     t.text "other_criteria"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "status", null: false
     t.string "cancellation_reason"
     t.text "cancellation_reason_comment"
@@ -93,24 +92,24 @@
   create_table "assessment_questions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "title", null: false
     t.string "category", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "key", null: false
-    t.datetime "disabled_at"
+    t.datetime "disabled_at", precision: nil
   end
 
   create_table "categories", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "key", null: false
     t.string "title", null: false
     t.boolean "move_supported", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["key"], name: "index_categories_on_key", unique: true
   end
 
   create_table "court_hearings", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "move_id"
-    t.datetime "start_time", null: false
+    t.datetime "start_time", precision: nil, null: false
     t.date "case_start_date"
     t.string "case_type"
     t.text "comments"
@@ -118,16 +117,16 @@
     t.integer "nomis_case_id"
     t.integer "nomis_hearing_id"
     t.boolean "saved_to_nomis", default: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["move_id"], name: "index_court_hearings_on_move_id"
   end
 
   create_table "documents", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.uuid "move_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.datetime "discarded_at"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
+    t.datetime "discarded_at", precision: nil
     t.string "documentable_type"
     t.uuid "documentable_id"
     t.index ["discarded_at"], name: "index_documents_on_discarded_at"
@@ -139,16 +138,16 @@
     t.string "key", null: false
     t.string "title", null: false
     t.string "description"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "nomis_code"
-    t.datetime "disabled_at"
+    t.datetime "disabled_at", precision: nil
   end
 
   create_table "flipper_features", force: :cascade do |t|
     t.string "key", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["key"], name: "index_flipper_features_on_key", unique: true
   end
 
@@ -156,8 +155,8 @@
     t.string "feature_key", null: false
     t.string "key", null: false
     t.string "value"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["feature_key", "key", "value"], name: "index_flipper_gates_on_feature_key_and_key_and_value", unique: true
   end
 
@@ -166,8 +165,8 @@
     t.string "flag_type", null: false
     t.string "title", null: false
     t.string "question_value", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["framework_question_id"], name: "index_framework_flags_on_framework_question_id"
   end
 
@@ -182,8 +181,8 @@
     t.string "code_type", null: false
     t.string "code"
     t.boolean "fallback", default: false, null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "framework_nomis_codes_questions", id: false, force: :cascade do |t|
@@ -203,8 +202,8 @@
     t.date "end_date"
     t.date "creation_date"
     t.date "expiry_date"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.date "approval_date"
     t.date "next_review_date"
   end
@@ -227,8 +226,8 @@
     t.boolean "followup_comment", default: false, null: false
     t.string "followup_comment_options", default: [], array: true
     t.uuid "parent_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "prefill"
     t.index ["framework_id"], name: "index_framework_questions_on_framework_id"
     t.index ["parent_id"], name: "index_framework_questions_on_parent_id"
@@ -240,8 +239,8 @@
     t.jsonb "value_json"
     t.string "type", null: false
     t.uuid "parent_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "responded", default: false, null: false
     t.boolean "prefilled", default: false, null: false
     t.uuid "assessmentable_id"
@@ -249,7 +248,7 @@
     t.string "value_type", null: false
     t.string "section", null: false
     t.string "responded_by"
-    t.datetime "responded_at"
+    t.datetime "responded_at", precision: nil
     t.index ["assessmentable_type", "assessmentable_id"], name: "index_responses_on_assessmentable_type_and_assessmentable_id"
     t.index ["framework_question_id"], name: "index_framework_responses_on_framework_question_id"
     t.index ["parent_id"], name: "index_framework_responses_on_parent_id"
@@ -259,19 +258,19 @@
   create_table "frameworks", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "name", null: false
     t.string "version", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["name", "version"], name: "index_frameworks_on_name_and_version", unique: true
   end
 
   create_table "genders", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "title", null: false
     t.string "description"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "key", null: false
     t.string "nomis_code"
-    t.datetime "disabled_at"
+    t.datetime "disabled_at", precision: nil
   end
 
   create_table "generic_events", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -281,10 +280,10 @@
     t.text "notes"
     t.string "created_by"
     t.jsonb "details"
-    t.datetime "occurred_at", null: false
-    t.datetime "recorded_at", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "occurred_at", precision: nil, null: false
+    t.datetime "recorded_at", precision: nil, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.uuid "supplier_id"
     t.string "classification", default: "default"
     t.index ["eventable_id", "eventable_type", "classification"], name: "index_on_generic_event_classification"
@@ -298,7 +297,7 @@
   create_table "identifier_types", id: :string, force: :cascade do |t|
     t.string "title", null: false
     t.string "description"
-    t.datetime "disabled_at"
+    t.datetime "disabled_at", precision: nil
   end
 
   create_table "journeys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -309,9 +308,9 @@
     t.boolean "billable", default: false, null: false
     t.string "state", null: false
     t.jsonb "vehicle"
-    t.datetime "client_timestamp", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "client_timestamp", precision: nil, null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.date "date"
     t.index ["client_timestamp"], name: "index_journeys_on_client_timestamp"
     t.index ["date"], name: "index_journeys_on_date"
@@ -331,11 +330,11 @@
   create_table "locations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "title", null: false
     t.string "location_type"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "nomis_agency_id"
     t.string "key", null: false
-    t.datetime "disabled_at"
+    t.datetime "disabled_at", precision: nil
     t.boolean "can_upload_documents", default: false, null: false
     t.uuid "category_id"
     t.boolean "young_offender_institution", default: false
@@ -355,8 +354,8 @@
   create_table "locations_regions", id: false, force: :cascade do |t|
     t.uuid "location_id", null: false
     t.uuid "region_id", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["location_id", "region_id"], name: "index_locations_regions_on_location_id_and_region_id", unique: true
     t.index ["location_id"], name: "index_locations_regions_on_location_id"
     t.index ["region_id", "location_id"], name: "index_locations_regions_on_region_id_and_location_id", unique: true
@@ -368,8 +367,8 @@
     t.uuid "location_id", null: false
     t.string "start_date"
     t.string "end_date"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["location_id"], name: "index_lodgings_on_location_id"
     t.index ["move_id"], name: "index_lodgings_on_move_id"
     t.index ["start_date", "move_id"], name: "index_lodgings_on_start_date_and_move_id", unique: true
@@ -380,13 +379,13 @@
     t.uuid "from_location_id", null: false
     t.uuid "to_location_id"
     t.string "status", default: "requested", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "reference", null: false
     t.string "move_type"
     t.string "additional_information"
     t.integer "nomis_event_id"
-    t.datetime "time_due"
+    t.datetime "time_due", precision: nil
     t.string "cancellation_reason"
     t.text "cancellation_reason_comment"
     t.uuid "profile_id"
@@ -416,10 +415,10 @@
   create_table "nationalities", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "title", null: false
     t.string "description"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "key", null: false
-    t.datetime "disabled_at"
+    t.datetime "disabled_at", precision: nil
   end
 
   create_table "nomis_alerts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
@@ -428,8 +427,8 @@
     t.string "description", null: false
     t.string "type_description", null: false
     t.uuid "assessment_question_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "notification_types", id: :string, force: :cascade do |t|
@@ -442,11 +441,11 @@
     t.uuid "topic_id", null: false
     t.string "topic_type", null: false
     t.integer "delivery_attempts", default: 0, null: false
-    t.datetime "delivery_attempted_at"
-    t.datetime "delivered_at"
-    t.datetime "discarded_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "delivery_attempted_at", precision: nil
+    t.datetime "delivered_at", precision: nil
+    t.datetime "discarded_at", precision: nil
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.uuid "response_id"
     t.string "notification_type_id", null: false
     t.index ["delivered_at"], name: "index_notifications_on_delivered_at"
@@ -465,8 +464,8 @@
     t.string "token", null: false
     t.integer "expires_in", null: false
     t.text "redirect_uri", null: false
-    t.datetime "created_at", null: false
-    t.datetime "revoked_at"
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "revoked_at", precision: nil
     t.string "scopes"
     t.index ["application_id"], name: "index_oauth_access_grants_on_application_id"
     t.index ["resource_owner_id"], name: "index_oauth_access_grants_on_resource_owner_id"
@@ -479,8 +478,8 @@
     t.string "token", null: false
     t.string "refresh_token"
     t.integer "expires_in"
-    t.datetime "revoked_at"
-    t.datetime "created_at", null: false
+    t.datetime "revoked_at", precision: nil
+    t.datetime "created_at", precision: nil, null: false
     t.string "scopes"
     t.string "previous_refresh_token", default: "", null: false
     t.index ["application_id"], name: "index_oauth_access_tokens_on_application_id"
@@ -496,8 +495,8 @@
     t.text "redirect_uri"
     t.string "scopes", default: "", null: false
     t.boolean "confidential", default: true, null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.uuid "owner_id"
     t.string "owner_type"
     t.index ["owner_id", "owner_type"], name: "index_oauth_applications_on_owner_id_and_owner_type"
@@ -505,8 +504,8 @@
   end
 
   create_table "people", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.citext "nomis_prison_number"
     t.citext "prison_number"
     t.citext "criminal_records_office"
@@ -517,7 +516,7 @@
     t.string "gender_additional_information"
     t.uuid "ethnicity_id"
     t.uuid "gender_id"
-    t.datetime "last_synced_with_nomis"
+    t.datetime "last_synced_with_nomis", precision: nil
     t.integer "latest_nomis_booking_id"
     t.index ["criminal_records_office"], name: "index_people_on_criminal_records_office"
     t.index ["date_of_birth"], name: "index_people_on_date_of_birth"
@@ -533,17 +532,17 @@
     t.uuid "framework_id", null: false
     t.uuid "profile_id", null: false
     t.string "status", null: false
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.datetime "confirmed_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "confirmed_at", precision: nil
     t.uuid "move_id"
     t.jsonb "nomis_sync_status", default: [], null: false
     t.uuid "prefill_source_id"
-    t.datetime "completed_at"
+    t.datetime "completed_at", precision: nil
     t.jsonb "section_progress", default: [], null: false
-    t.datetime "amended_at"
+    t.datetime "amended_at", precision: nil
     t.jsonb "handover_details", default: {}, null: false
-    t.datetime "handover_occurred_at"
+    t.datetime "handover_occurred_at", precision: nil
     t.index ["framework_id"], name: "index_person_escort_records_on_framework_id"
     t.index ["move_id"], name: "index_person_escort_records_on_move_id"
     t.index ["prefill_source_id"], name: "index_person_escort_records_on_prefill_source_id"
@@ -562,8 +561,8 @@
     t.integer "out_of_area_courts", null: false
     t.integer "discharges", null: false
     t.string "updated_by"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["date"], name: "index_populations_on_date"
     t.index ["location_id", "date"], name: "index_on_population_uniqueness", unique: true
     t.index ["location_id"], name: "index_populations_on_location_id"
@@ -572,7 +571,7 @@
   create_table "prison_transfer_reasons", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "key", null: false
     t.string "title", null: false
-    t.datetime "disabled_at"
+    t.datetime "disabled_at", precision: nil
     t.index ["key"], name: "index_prison_transfer_reasons_on_key"
   end
 
@@ -585,8 +584,8 @@
     t.uuid "gender_id"
     t.uuid "ethnicity_id"
     t.uuid "nationality_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.jsonb "assessment_answers"
     t.jsonb "profile_identifiers"
     t.string "gender_additional_information"
@@ -604,8 +603,8 @@
   create_table "regions", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "name", null: false
     t.string "key", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["key"], name: "index_regions_on_key"
   end
 
@@ -614,9 +613,9 @@
     t.string "callback_url"
     t.string "encrypted_secret"
     t.boolean "enabled", default: true, null: false
-    t.datetime "discarded_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "discarded_at", precision: nil
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "email_address"
     t.string "encrypted_username"
     t.string "encrypted_password"
@@ -630,8 +629,8 @@
     t.uuid "location_id", null: false
     t.date "effective_from"
     t.date "effective_to"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["effective_from"], name: "index_supplier_locations_on_effective_from"
     t.index ["effective_to"], name: "index_supplier_locations_on_effective_to"
     t.index ["location_id"], name: "index_supplier_locations_on_location_id"
@@ -641,8 +640,8 @@
   create_table "suppliers", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "name", null: false
     t.string "key", null: false
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.index ["key"], name: "index_suppliers_on_key"
   end
 
@@ -652,7 +651,7 @@
     t.string "event", null: false
     t.string "whodunnit"
     t.text "object"
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.uuid "supplier_id"
     t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
   end
@@ -664,10 +663,10 @@
     t.uuid "prefill_source_id"
     t.string "status", null: false
     t.jsonb "nomis_sync_status", default: [], null: false
-    t.datetime "confirmed_at"
-    t.datetime "completed_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "confirmed_at", precision: nil
+    t.datetime "completed_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.jsonb "section_progress", default: [], null: false
     t.index ["framework_id"], name: "index_youth_risk_assessments_on_framework_id"
     t.index ["move_id"], name: "index_youth_risk_assessments_on_move_id"
diff --git a/spec/requests/api/moves_controller_create_spec.rb b/spec/requests/api/moves_controller_create_spec.rb
index f2fe7d07f..612c48025 100644
--- a/spec/requests/api/moves_controller_create_spec.rb
+++ b/spec/requests/api/moves_controller_create_spec.rb
@@ -115,7 +115,7 @@
         before { post_moves }
 
         it 'returns the correct data' do
-          ActiveStorage::Current.host = 'http://www.example.com' # This is used in the serializer
+          ActiveStorage::Current.url_options = { protocol: 'http', host: 'www.example.com', port: 80 } # This is used in the serializer
           expected_response_json = JSON.parse(MoveSerializer.new(move, include: MoveSerializer::SUPPORTED_RELATIONSHIPS).serializable_hash.to_json)
 
           # Now, URL is a S3 url (not activestorage) hence it changes everytime we call the endpoint
diff --git a/spec/requests/api/moves_controller_update_spec.rb b/spec/requests/api/moves_controller_update_spec.rb
index 1dad0a1a4..e8742076a 100644
--- a/spec/requests/api/moves_controller_update_spec.rb
+++ b/spec/requests/api/moves_controller_update_spec.rb
@@ -8,7 +8,7 @@
   let(:content_type) { ApiController::CONTENT_TYPE }
   let(:response_json) { JSON.parse(response.body) }
   let(:resource_to_json) do
-    ActiveStorage::Current.host = 'http://www.example.com' # This is used in the serializer
+    ActiveStorage::Current.url_options = { protocol: 'http', host: 'www.example.com', port: 80 } # This is used in the serializer
     JSON.parse(MoveSerializer.new(move.reload, include: MoveSerializer::SUPPORTED_RELATIONSHIPS).serializable_hash.to_json)
   end
 
diff --git a/spec/requests/api/person_escort_records_controller_create_spec.rb b/spec/requests/api/person_escort_records_controller_create_spec.rb
index b12b1fcca..7259323df 100644
--- a/spec/requests/api/person_escort_records_controller_create_spec.rb
+++ b/spec/requests/api/person_escort_records_controller_create_spec.rb
@@ -267,7 +267,7 @@
 
       context 'with a reference to a missing framework' do
         let(:framework_version) { '0.2.1' }
-        let(:detail_404) { "Couldn't find Framework" }
+        let(:detail_404) { 'Couldn\'t find Framework with [WHERE "frameworks"."version" = $1 AND "frameworks"."name" = $2]' }
 
         it_behaves_like 'an endpoint that responds with error 404'
       end
@@ -288,7 +288,7 @@
             },
           }
         end
-        let(:detail_404) { "Couldn't find Framework" }
+        let(:detail_404) { 'Couldn\'t find Framework with [WHERE "frameworks"."version" IS NULL AND "frameworks"."name" = $1]' }
 
         it_behaves_like 'an endpoint that responds with error 404'
       end
diff --git a/spec/requests/api/youth_risk_assessments_controller_create_spec.rb b/spec/requests/api/youth_risk_assessments_controller_create_spec.rb
index 3eebcd39c..86bcad2ca 100644
--- a/spec/requests/api/youth_risk_assessments_controller_create_spec.rb
+++ b/spec/requests/api/youth_risk_assessments_controller_create_spec.rb
@@ -278,7 +278,7 @@
 
       context 'with a reference to a missing framework' do
         let(:framework_version) { '0.2.1' }
-        let(:detail_404) { "Couldn't find Framework" }
+        let(:detail_404) { 'Couldn\'t find Framework with [WHERE "frameworks"."version" = $1 AND "frameworks"."name" = $2]' }
 
         it_behaves_like 'an endpoint that responds with error 404'
       end
@@ -299,7 +299,7 @@
             },
           }
         end
-        let(:detail_404) { "Couldn't find Framework" }
+        let(:detail_404) { 'Couldn\'t find Framework with [WHERE "frameworks"."version" IS NULL AND "frameworks"."name" = $1]' }
 
         it_behaves_like 'an endpoint that responds with error 404'
       end
diff --git a/spec/serializers/document_serializer_spec.rb b/spec/serializers/document_serializer_spec.rb
index 338fcca5b..9d456ad2b 100644
--- a/spec/serializers/document_serializer_spec.rb
+++ b/spec/serializers/document_serializer_spec.rb
@@ -8,7 +8,7 @@
   let(:document) { create :document }
   let(:result) { JSON.parse(serializer.serializable_hash.to_json).deep_symbolize_keys }
 
-  before { ActiveStorage::Current.host = 'http://example.com' }
+  before { ActiveStorage::Current.url_options = { protocol: 'http', host: 'example.com', port: 80 } }
 
   it 'contains a type property' do
     expect(result[:data][:type]).to eql 'documents'
diff --git a/spec/serializers/move_serializer_spec.rb b/spec/serializers/move_serializer_spec.rb
index 41cafd275..bc7b36915 100644
--- a/spec/serializers/move_serializer_spec.rb
+++ b/spec/serializers/move_serializer_spec.rb
@@ -227,7 +227,7 @@
     let(:adapter_options) { { include: ['profile.documents'] } }
     let(:move) { create(:move, profile: create(:profile, :with_documents)) }
 
-    before { ActiveStorage::Current.host = 'http://www.example.com' } # This is used in the serializer
+    before { ActiveStorage::Current.url_options = { protocol: 'http', host: 'www.example.com', port: 80 } } # This is used in the serializer
 
     it 'contains included documents relationships' do
       expect(result[:included].map { |r| r[:type] })
diff --git a/spec/serializers/profile_serializer_spec.rb b/spec/serializers/profile_serializer_spec.rb
index 70b5f397f..074c1d332 100644
--- a/spec/serializers/profile_serializer_spec.rb
+++ b/spec/serializers/profile_serializer_spec.rb
@@ -87,7 +87,7 @@
       }
     end
 
-    before { ActiveStorage::Current.host = 'http://www.example.com' } # This is used in the serializer
+    before { ActiveStorage::Current.url_options = { protocol: 'http', host: 'www.example.com', port: 80 } } # This is used in the serializer
 
     it 'returns the expected serialized `Profile`' do
       expect(result).to include_json(expected_document)
diff --git a/spec/serializers/v2/move_serializer_spec.rb b/spec/serializers/v2/move_serializer_spec.rb
index 78e1de027..54bde603e 100644
--- a/spec/serializers/v2/move_serializer_spec.rb
+++ b/spec/serializers/v2/move_serializer_spec.rb
@@ -65,7 +65,7 @@
 
     let(:adapter_options) { { include: described_class::SUPPORTED_RELATIONSHIPS } }
 
-    before { ActiveStorage::Current.host = 'http://www.example.com' } # This is used in the serializer
+    before { ActiveStorage::Current.url_options = { protocol: 'http', host: 'www.example.com', port: 80 } } # This is used in the serializer
 
     it 'contains all included relationships' do
       expect(result[:included].map { |r| r[:type] })
diff --git a/spec/serializers/v2/profile_serializer_spec.rb b/spec/serializers/v2/profile_serializer_spec.rb
index ed37f2882..747bc2c33 100644
--- a/spec/serializers/v2/profile_serializer_spec.rb
+++ b/spec/serializers/v2/profile_serializer_spec.rb
@@ -111,7 +111,7 @@
       }
     end
 
-    before { ActiveStorage::Current.host = 'http://www.example.com' } # This is used in the serializer
+    before { ActiveStorage::Current.url_options = { protocol: 'http', host: 'www.example.com', port: 80 } } # This is used in the serializer
 
     it 'returns the expected serialized `Profile`' do
       expect(result).to include_json(expected_document)
diff --git a/spec/services/encryptor_spec.rb b/spec/services/encryptor_spec.rb
index 540521c29..6ac711192 100644
--- a/spec/services/encryptor_spec.rb
+++ b/spec/services/encryptor_spec.rb
@@ -30,4 +30,26 @@
 
     it { is_expected.to eql('+TILrwJJFp5zhQzWFW3tAQbiu2rYyrAbe7vr5tEGUxc=') }
   end
+
+  # Since Rails 7.0, new applications use SHA256 by default, but we still want
+  # to use SHA1 to be compatible with secrets created by Rails 6.1.
+  describe 'decrypt' do
+    subject { described_class.decrypt(sha1_secret) }
+
+    let(:sha1_key) do
+      ActiveSupport::KeyGenerator.new(
+        Rails.application.secret_key_base,
+        { hash_digest_class: OpenSSL::Digest::SHA1 },
+      ).generate_key(
+        ENV.fetch('ENCRYPTOR_SALT'),
+        ActiveSupport::MessageEncryptor.key_len,
+      )
+    end
+
+    let(:sha1_secret) do
+      ActiveSupport::MessageEncryptor.new(sha1_key).encrypt_and_sign('decrypted_secret')
+    end
+
+    it { is_expected.to eql('decrypted_secret') }
+  end
 end
diff --git a/spec/services/people/retrieve_image_spec.rb b/spec/services/people/retrieve_image_spec.rb
index 358897997..f7f1aec34 100644
--- a/spec/services/people/retrieve_image_spec.rb
+++ b/spec/services/people/retrieve_image_spec.rb
@@ -21,7 +21,7 @@
     context 'when person.image.attached? is true' do
       before do
         person.latest_nomis_booking_id = 123
-        person.image.attach(io: StringIO.new, filename: 'filename', content_type: 'image/jpg')
+        person.image.attach(io: StringIO.new, filename: 'filename', content_type: 'image/jpeg')
         allow(person).to receive(:attach_image).and_return(true)
         allow(NomisClient::Image).to receive(:get).and_return('image_blob')
       end