diff --git a/Gemfile b/Gemfile
index fa6189fd85..f3356c0581 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ ruby '~> 2.7.3'
 gem 'rake'
 gem 'thor'
 gem 'pry', '~> 0.14.0'
-gem 'activesupport', '~> 5.2', require: false
+gem 'activesupport', '~> 6.1', require: false
 gem 'yajl-ruby', require: false
 gem 'html-pipeline'
 gem 'typhoeus'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ea640d5a3..bf5d799f4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.6)
+    activesupport (6.1.7.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     backports (3.15.0)
     better_errors (2.9.1)
       coderay (>= 1.0.0)
@@ -18,7 +19,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.3)
     daemons (1.4.0)
     erubi (1.10.0)
     ethon (0.12.0)
@@ -32,7 +33,7 @@ GEM
     html-pipeline (2.12.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    i18n (1.8.10)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     image_optim (0.26.5)
       exifr (~> 1.2, >= 1.2.2)
@@ -115,7 +116,6 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thor (0.20.3)
-    thread_safe (0.3.6)
     tilt (2.0.10)
     tty-pager (0.12.1)
       strings (~> 0.1.4)
@@ -125,20 +125,21 @@ GEM
     tty-which (0.4.1)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
     unicode_utils (1.4.0)
     unix_utils (0.0.15)
     yajl-ruby (1.4.2)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 5.2)
+  activesupport (~> 6.1)
   better_errors
   browser
   chunky_png