diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 018d2a7..50e1c0b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,28 +5,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.0', '3.1', '3.2', '3.3']
-        gemfile:
-          - activemodel_6_1
-          - activemodel_7_0
-          - activemodel_7_1
-          - activemodel_7_2
-          - activemodel_8_0
+        ruby: ['3.0', '3.1', '3.2', '3.3', '3.4']
+        rails: ['7.1', '7.2', '8.0', '8.1']
         exclude:
           # Rails 7.2 requires Ruby >= 3.1.0
           - ruby: '3.0'
-            gemfile: 'activemodel_7_2'
+            rails: '7.2'
           # Rails 8.0 requires Ruby >= 3.2.0
           - ruby: '3.0'
-            gemfile: 'activemodel_8_0'
+            rails: '8.0'
           - ruby: '3.1'
-            gemfile: 'activemodel_8_0'
-    name: Ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
+            rails: '8.0'
+          # Rails 8.1 requires Ruby >= 3.2.0
+          - ruby: '3.0'
+            rails: '8.1'
+          - ruby: '3.1'
+            rails: '8.1'
+    name: Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }}
     runs-on: ubuntu-latest
     env:
-      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_GEMFILE: gemfiles/activemodel_${{ matrix.rails }}.gemfile
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml
index 939d7aa..4400bce 100644
--- a/.github/workflows/gem-push.yml
+++ b/.github/workflows/gem-push.yml
@@ -12,14 +12,11 @@ jobs:
       packages: write
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Set up Ruby 3.2
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-    # uses: ruby/setup-ruby@v1
-      uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+    - uses: actions/checkout@v5
+    - name: Set up Ruby 3.4
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.2.2
+        ruby-version: 3.4.7
 
     - name: Publish to GPR
       run: |
diff --git a/accept_values_for.gemspec b/accept_values_for.gemspec
index 323ac83..ba94160 100644
--- a/accept_values_for.gemspec
+++ b/accept_values_for.gemspec
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
 
-  spec.add_dependency "activemodel", ">= 6.1", "< 8.1"
+  spec.add_dependency "activemodel", ">= 7.1", "< 8.2"
   spec.add_dependency "rspec", ">= 3.10", "< 4.0"
 
   spec.add_development_dependency "bundler", "~> 2.2"
diff --git a/gemfiles/activemodel_6_1.gemfile b/gemfiles/activemodel_6_1.gemfile
deleted file mode 100644
index 4ef4074..0000000
--- a/gemfiles/activemodel_6_1.gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "activemodel", "~> 6.1.0"
-
-group :test do
-  gem "activerecord", "~> 6.1.0", require: "active_record"
-  gem "rspec", "~> 3.10"
-  gem "sqlite3", "~> 1.4"
-end
diff --git a/gemfiles/activemodel_7_1.gemfile b/gemfiles/activemodel_7.1.gemfile
similarity index 100%
rename from gemfiles/activemodel_7_1.gemfile
rename to gemfiles/activemodel_7.1.gemfile
diff --git a/gemfiles/activemodel_7_2.gemfile b/gemfiles/activemodel_7.2.gemfile
similarity index 100%
rename from gemfiles/activemodel_7_2.gemfile
rename to gemfiles/activemodel_7.2.gemfile
diff --git a/gemfiles/activemodel_7_0.gemfile b/gemfiles/activemodel_7_0.gemfile
deleted file mode 100644
index a35e9c8..0000000
--- a/gemfiles/activemodel_7_0.gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "activemodel", "~> 7.0.0"
-
-group :test do
-  gem "activerecord", "~> 7.0.0", require: "active_record"
-  gem "rspec", "~> 3.10"
-  gem "sqlite3", "~> 1.4"
-end
diff --git a/gemfiles/activemodel_8_0.gemfile b/gemfiles/activemodel_8.0.gemfile
similarity index 100%
rename from gemfiles/activemodel_8_0.gemfile
rename to gemfiles/activemodel_8.0.gemfile
diff --git a/gemfiles/activemodel_8.1.gemfile b/gemfiles/activemodel_8.1.gemfile
new file mode 100644
index 0000000..87faca2
--- /dev/null
+++ b/gemfiles/activemodel_8.1.gemfile
@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "activemodel", "~> 8.1.0"
+
+group :test do
+  gem "activerecord", "~> 8.1.0", require: "active_record"
+  gem "rspec", "~> 3.13"
+  gem "sqlite3", "~> 2.2"
+end