diff --git a/Appraisals b/Appraisals
index 7e3495a..75fd399 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-appraise 'rails-5' do
-  gem 'activesupport', '~> 5.2'
-end
+require "appraisal/matrix"
 
-appraise 'rails-6' do
-  gem 'activesupport', '~> 6.0'
-end
-
-appraise 'rails-7' do
-  gem 'activesupport', '~> 7.0'
-end
+appraisal_matrix(activesupport: "7.0")
diff --git a/Gemfile b/Gemfile
index 7eaa48b..dcf5663 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'appraisal'
+gem 'appraisal-matrix'
 gem 'pry'
 gem 'rake'
 gem 'rspec', '~> 3.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index 194c2c6..2608369 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,6 +17,8 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
+    appraisal-matrix (0.3.0)
+      appraisal (~> 2.2)
     ast (2.4.2)
     base64 (0.2.0)
     bigdecimal (3.1.9)
@@ -71,6 +73,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  appraisal-matrix
   base64 (>= 0.2.0)
   bigdecimal (>= 3.1)
   concurrent-ruby (~> 1.0, < 1.3.5)
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/activesupport_7_0.gemfile
similarity index 86%
rename from gemfiles/rails_5.gemfile
rename to gemfiles/activesupport_7_0.gemfile
index 63db74d..97d7028 100644
--- a/gemfiles/rails_5.gemfile
+++ b/gemfiles/activesupport_7_0.gemfile
@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
+gem "appraisal-matrix"
 gem "pry"
 gem "rake"
 gem "rspec", "~> 3.7"
@@ -13,6 +14,6 @@ gem "concurrent-ruby", "~> 1.0", "< 1.3.5"
 gem "base64", ">= 0.2.0"
 gem "bigdecimal", ">= 3.1"
 gem "mutex_m", ">= 0.3.0"
-gem "activesupport", "~> 5.2"
+gem "activesupport", "~> 7.0.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.gemfile b/gemfiles/activesupport_7_1.gemfile
similarity index 86%
rename from gemfiles/rails_6.gemfile
rename to gemfiles/activesupport_7_1.gemfile
index 874447e..9d312b4 100644
--- a/gemfiles/rails_6.gemfile
+++ b/gemfiles/activesupport_7_1.gemfile
@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
+gem "appraisal-matrix"
 gem "pry"
 gem "rake"
 gem "rspec", "~> 3.7"
@@ -13,6 +14,6 @@ gem "concurrent-ruby", "~> 1.0", "< 1.3.5"
 gem "base64", ">= 0.2.0"
 gem "bigdecimal", ">= 3.1"
 gem "mutex_m", ">= 0.3.0"
-gem "activesupport", "~> 6.0"
+gem "activesupport", "~> 7.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.gemfile b/gemfiles/activesupport_7_2.gemfile
similarity index 86%
rename from gemfiles/rails_7.gemfile
rename to gemfiles/activesupport_7_2.gemfile
index 1e07183..c36f65e 100644
--- a/gemfiles/rails_7.gemfile
+++ b/gemfiles/activesupport_7_2.gemfile
@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
+gem "appraisal-matrix"
 gem "pry"
 gem "rake"
 gem "rspec", "~> 3.7"
@@ -13,6 +14,6 @@ gem "concurrent-ruby", "~> 1.0", "< 1.3.5"
 gem "base64", ">= 0.2.0"
 gem "bigdecimal", ">= 3.1"
 gem "mutex_m", ">= 0.3.0"
-gem "activesupport", "~> 7.0"
+gem "activesupport", "~> 7.2.0"
 
 gemspec path: "../"
diff --git a/gemfiles/activesupport_8_0.gemfile b/gemfiles/activesupport_8_0.gemfile
new file mode 100644
index 0000000..a977c92
--- /dev/null
+++ b/gemfiles/activesupport_8_0.gemfile
@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "appraisal-matrix"
+gem "pry"
+gem "rake"
+gem "rspec", "~> 3.7"
+gem "rspec_junit_formatter", "~> 0.4"
+gem "rspec-mocks"
+gem "rubocop", "0.54.0"
+gem "concurrent-ruby", "~> 1.0", "< 1.3.5"
+gem "base64", ">= 0.2.0"
+gem "bigdecimal", ">= 3.1"
+gem "mutex_m", ">= 0.3.0"
+gem "activesupport", "~> 8.0.0"
+
+gemspec path: "../"