diff --git a/Gemfile b/Gemfile
index f2917bc613..d9e5029d2e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -93,7 +93,7 @@ gem 'bootsnap', require: false
 gem 'geocoder'
 gem 'gmaps4rails'
 gem 'mimemagic', '> 0.3.5'
-gem 'paper_trail', '~> 12.1'
+gem 'paper_trail'
 gem 'rack-rewrite'
 gem 'rack-timeout'
 gem 'roadie-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index a88a6c6e7d..7f4a28cb3a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -464,9 +464,9 @@ GEM
     orm_adapter (0.5.0)
     pagy (5.10.1)
       activesupport
-    paper_trail (12.3.0)
-      activerecord (>= 5.2)
-      request_store (~> 1.1)
+    paper_trail (15.1.0)
+      activerecord (>= 6.1)
+      request_store (~> 1.4)
     parallel (1.24.0)
     paranoia (2.6.3)
       activerecord (>= 5.1, < 7.2)
@@ -878,7 +878,7 @@ DEPENDENCIES
   openid_connect (~> 1.3)
   order_management!
   pagy (~> 5.1)
-  paper_trail (~> 12.1)
+  paper_trail
   paranoia (~> 2.4)
   paypal-sdk-merchant (= 1.117.2)
   pdf-reader
diff --git a/config/application.rb b/config/application.rb
index 116fb5970a..1146d04c77 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,8 +9,8 @@ require "rails"
   "action_mailer/railtie",
   "active_job/railtie",
   "action_cable/engine",
-  #"action_mailbox/engine",
-  #"action_text/engine",
+  # "action_mailbox/engine",
+  # "action_text/engine",
   "rails/test_unit/railtie",
   "sprockets/railtie" # Disable this after migrating to Webpacker
 ].each do |railtie|
@@ -150,6 +150,7 @@ module Openfoodnetwork
       module ::Reporting; end
       Rails.application.reloader.to_prepare do
         next if defined?(::Reporting) && defined?(::Reporting::Errors)
+
         loader = Zeitwerk::Loader.new
         loader.push_dir("#{Rails.root}/lib/reporting", namespace: ::Reporting)
         loader.enable_reloading
@@ -227,7 +228,9 @@ module Openfoodnetwork
     config.action_view.form_with_generates_remote_forms = false
     config.active_record.cache_versioning = false
     config.active_record.has_many_inversing = false
-    config.active_record.yaml_column_permitted_classes = [BigDecimal, Symbol]
+    config.active_record.yaml_column_permitted_classes = [BigDecimal, Symbol, Time,
+                                                          ActiveSupport::TimeWithZone,
+                                                          ActiveSupport::TimeZone]
 
     config.active_support.escape_html_entities_in_json = true