diff --git a/.rubocop.yml b/.rubocop.yml
index 8ba9e9da..5a9dd502 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -24,6 +24,7 @@ AllCops:
     - 'vendor/**/*'
     - db/schema.rb
     - db/views_schema.rb
+    - db/migrate/*
   SuggestExtensions: false
 
 Style/DocumentDynamicEvalDefinition:
diff --git a/.ruby-version b/.ruby-version
index 75a22a26..ef538c28 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.3
+3.1.2
diff --git a/Dockerfile b/Dockerfile
index ec8efe12..4a2d6f7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ruby:2.7
+FROM ruby:3.1.2
 
-RUN gem install bundler -v 2.4.22
+RUN gem install bundler
 
 # throw errors if Gemfile has been modified since Gemfile.lock
 RUN bundle config --global frozen 1
diff --git a/Gemfile.lock b/Gemfile.lock
index 193b78b6..3504dfa9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
       railties (>= 5.0.0)
     ffi (1.15.5)
     formatador (1.1.0)
-    guard (2.18.0)
+    guard (2.18.1)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -81,7 +81,7 @@ GEM
     loofah (2.21.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lumberjack (1.2.8)
+    lumberjack (1.2.9)
     method_source (1.0.0)
     mini_portile2 (2.8.4)
     minitest (5.20.0)
@@ -169,12 +169,13 @@ GEM
     rubocop-performance (1.18.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.20.2)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
     rubocop-rspec (2.26.1)
       rubocop (~> 1.40)
+      rubocop-ast (>= 1.30.0, < 2.0)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
diff --git a/app/models/associated_with_roles.rb b/app/models/associated_with_roles.rb
index fe5c8a50..e1d0704e 100644
--- a/app/models/associated_with_roles.rb
+++ b/app/models/associated_with_roles.rb
@@ -43,7 +43,7 @@ def maintain_users
       users.create!(
         users_to_maintain.map do |role, user_details|
           user_details.map do |details|
-            details.reverse_merge(role: role.to_s, associated_id: id, last_updated: last_updated)
+            details.reverse_merge(role: role.to_s, associated_id: id, last_updated:)
           end
         end
       )
diff --git a/db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb b/db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb
index c69887a9..d9077f5f 100644
--- a/db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb
+++ b/db/migrate/20230522131908_add_library_tube_barcode_to_pacbio_run.rb
@@ -14,7 +14,7 @@ def down
       t.remove :pac_bio_library_tube_barcode
     end
     # Here we add a placeholder value in case any plate barcodes were added as null since the migration
-    PacBioRun.where(plate_barcode: nil).each do |run|
+    PacBioRun.where(plate_barcode: nil).find_each do |run|
       run.plate_barcode = 'plate_barcode placeholder'
       run.save
     end
diff --git a/lib/resource_tools/json.rb b/lib/resource_tools/json.rb
index 28f19040..74a85ac9 100644
--- a/lib/resource_tools/json.rb
+++ b/lib/resource_tools/json.rb
@@ -146,6 +146,7 @@ def custom_value(name, &block)
       end
     end
 
+    # rubocop:disable Naming/BlockForwarding
     def initialize(*args, &block)
       super
       if self.class.custom_values.present?
@@ -156,6 +157,7 @@ def initialize(*args, &block)
       convert_booleans
       delete_if { |k, _| ignoreable.include?(k) }
     end
+    # rubocop:enable Naming/BlockForwarding
 
     def convert_booleans
       self.stored_as_boolean.each do |key|
diff --git a/lib/tasks/remove_duplicate_pac_bio_runs.rake b/lib/tasks/remove_duplicate_pac_bio_runs.rake
index 25de3039..79c91293 100644
--- a/lib/tasks/remove_duplicate_pac_bio_runs.rake
+++ b/lib/tasks/remove_duplicate_pac_bio_runs.rake
@@ -186,7 +186,7 @@ namespace :pac_bio_run_table do
     9993
   ]
   task remove_duplicate_pac_bio_runs: :environment do
-    PacBioRun.where(id_pac_bio_run_lims: list_of_runs).each do |pac_bio_run|
+    PacBioRun.where(id_pac_bio_run_lims: list_of_runs).find_each do |pac_bio_run|
       puts "Going to remove #{pac_bio_run.id_pac_bio_run_lims}"
       puts pac_bio_run.attributes
       pac_bio_run.delete
diff --git a/lib/tasks/update_pac_bio_run_name.rake b/lib/tasks/update_pac_bio_run_name.rake
index b4df5f2c..f5db66f5 100644
--- a/lib/tasks/update_pac_bio_run_name.rake
+++ b/lib/tasks/update_pac_bio_run_name.rake
@@ -4,7 +4,7 @@ namespace :pac_bio_run_table do
   desc 'Update pac_bio_run_name column with the values from id_pac_bio_run_lims'
 
   task update_pac_bio_run_name: :environment do
-    PacBioRun.all.each do |run|
+    PacBioRun.find_each do |run|
       next if run.pac_bio_run_name.present?
 
       run.pac_bio_run_name = run.id_pac_bio_run_lims
diff --git a/lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake b/lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake
index 4c85d1dc..87c23bec 100644
--- a/lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake
+++ b/lib/tasks/update_pac_bio_run_sequencescape_plate_numbers.rake
@@ -6,7 +6,7 @@ namespace :pac_bio_run_table do
   desc 'Update pac_bio_run plate_number column with the value 1 for sequencescape plates'
 
   task update_pac_bio_run_sequencescape_plate_numbers: :environment do
-    PacBioRun.where(id_lims: 'SQSCP').each do |run|
+    PacBioRun.where(id_lims: 'SQSCP').find_each do |run|
       run.plate_number = 1
       run.save!
     end
diff --git a/spec/models/flowcell_spec.rb b/spec/models/flowcell_spec.rb
index 3e8c9eab..6eb0c3c0 100644
--- a/spec/models/flowcell_spec.rb
+++ b/spec/models/flowcell_spec.rb
@@ -39,7 +39,7 @@
     include_examples 'full flowcell json'
 
     it 'flags all entries as spiked' do
-      Flowcell.all.each { |fc| expect(fc.spiked).to be_true }
+      Flowcell.find_each { |fc| expect(fc.spiked).to be_true }
     end
 
     context 'when update with identical tag indexes' do
@@ -130,7 +130,7 @@
     end
 
     it 'flags all entries as not-spiked' do
-      Flowcell.all.each { |fc| expect(fc.spiked).to be_false }
+      Flowcell.find_each { |fc| expect(fc.spiked).to be_false }
     end
   end
 
diff --git a/spec/support/it_behaves_like_a_nested_resource.rb b/spec/support/it_behaves_like_a_nested_resource.rb
index ade0a271..cb15471d 100644
--- a/spec/support/it_behaves_like_a_nested_resource.rb
+++ b/spec/support/it_behaves_like_a_nested_resource.rb
@@ -6,13 +6,13 @@
   end
 
   it 'ensures that the all rows are current' do
-    described_class.all.each do |row|
+    described_class.find_each do |row|
       expect(row.last_updated).to eq(most_recent_time)
     end
   end
 
   it 'ensures the row is marked with recorded time' do
-    described_class.all.each do |row|
+    described_class.find_each do |row|
       expect(row.recorded_at).to eq(recorded_time)
     end
   end
diff --git a/spec/support/it_behaves_like_associated_with_roles.rb b/spec/support/it_behaves_like_associated_with_roles.rb
index 81cabcb2..e2dfb8f8 100644
--- a/spec/support/it_behaves_like_associated_with_roles.rb
+++ b/spec/support/it_behaves_like_associated_with_roles.rb
@@ -2,7 +2,7 @@
 
 shared_examples_for 'maintains roles correctly' do
   after(:each) do
-    described_class.create_or_update_from_json(timestamped_json.merge(updated_roles).merge(updated_at: updated_at), 'example')
+    described_class.create_or_update_from_json(timestamped_json.merge(updated_roles).merge(updated_at:), 'example')
     users_fit_exactly(expected_roles)
   end