diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0dc132d2..d5a560da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,16 +16,17 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ["4.0", "3.4", "3.3", "3.2", "3.1"]
-        rails: ["8.1", "8.0", "7.2", "7.1"]
+        ruby: ["4.1.0-preview1", "4.0", "3.4", "3.3", "3.2", "3.1"]
+        rails: ["8.1.0", "8.0.0", "7.2.0", "7.1.0"]
         exclude:
           # Rails 8.x requires Ruby >= 3.2
-          - rails: "8.0"
+          - rails: "8.0.0"
             ruby: "3.1"
-          - rails: "8.1"
+          - rails: "8.1.0"
             ruby: "3.1"
 
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.ruby == '3.1' && 'ubuntu-24.04' || 'ubuntu-latest' }}
+    continue-on-error: ${{ matrix.ruby == '4.1.0-preview1' }}
 
     services:
       redis:
@@ -40,7 +41,7 @@ jobs:
     env:
       RAILS_VERSION: ${{ matrix.rails }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: ruby/setup-ruby@v1
         with:
diff --git a/Gemfile b/Gemfile
index 52472434..bb3e1f14 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,10 +4,12 @@ source "https://rubygems.org"
 
 gemspec
 
+rails_version = ENV.fetch("RAILS_VERSION", "8.1.0")
+
 gem "rubocop", require: false
 gem "codeclimate-test-reporter"
 gem "concurrent-ruby", "< 1.3.9"
 # json 3.0 dropped the quirks_mode option that ActiveSupport 7.2.3.x still passes
-gem "json", "< 3"
+gem "json", "< 3" if Gem::Version.new(rails_version) < Gem::Version.new("8.1")
 
-gem "rails", "~> #{ENV.fetch('RAILS_VERSION', '8.0')}"
+gem "rails", "~> #{rails_version}"