diff --git a/.ruby-version b/.ruby-version
index 2451c27ca..9cec7165a 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.7
+3.1.6
diff --git a/Gemfile b/Gemfile
index 234ac5820..94ac8c47d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,10 @@ end
 gem 'rails', '6.1.7.8'
 gem 'rails-i18n'
 
+# Psych 4 (included in Ruby 3.1) breaks Rails < 7
+# Remove this entry completely when updating to Rails 7
+gem 'psych', '< 4'
+
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 94cb69d95..9dd659a56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -416,9 +416,9 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    libv8-node (21.7.2.0)
-    libv8-node (21.7.2.0-x86_64-darwin)
-    libv8-node (21.7.2.0-x86_64-linux)
+    libv8-node (18.19.0.0)
+    libv8-node (18.19.0.0-x86_64-darwin)
+    libv8-node (18.19.0.0-x86_64-linux)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -446,8 +446,8 @@ GEM
     method_source (1.1.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    mini_racer (0.12.0)
-      libv8-node (~> 21.7.2.0)
+    mini_racer (0.16.0)
+      libv8-node (~> 18.19.0.0)
     minitest (5.25.1)
     msgpack (1.7.3)
     multi_json (1.15.0)
@@ -567,6 +567,7 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    psych (3.3.4)
     public_suffix (6.0.1)
     puma (6.4.3)
       nio4r (~> 2.0)
@@ -891,6 +892,7 @@ DEPENDENCIES
   pattern-library!
   pg
   premailer-rails
+  psych (< 4)
   puma
   puma_worker_killer
   rack-cors
@@ -928,4 +930,4 @@ DEPENDENCIES
   will_paginate
 
 BUNDLED WITH
-   2.3.13
+   2.3.27