diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73272d28..93738099 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,10 +35,16 @@ jobs:
           - ruby: '3.0'
             gemfile: rails_5_2
 
-          # Rails 7 requires Ruby 2.7 or higher
+          # Rails 8 requires Ruby 3.1 or higher
           - ruby: '2.6'
             gemfile: rails_main
 
+          - ruby: '2.7'
+            gemfile: rails_main
+
+          - ruby: '3.0'
+            gemfile: rails_main
+
           - ruby: '2.6'
             gemfile: rails_7_0
 
@@ -89,13 +95,19 @@ jobs:
           - ruby: '3.0'
             gemfile: rails_5_2
 
-          # Rails 7 requires Ruby 2.7 or higher
+          # Rails 8 requires Ruby 3.1 or higher
           - ruby: '2.6'
             gemfile: rails_main
 
+          - ruby: '2.7'
+            gemfile: rails_main
+
+          - ruby: '3.0'
+            gemfile: rails_main
+
           - ruby: '2.6'
             gemfile: rails_7_0
-            
+
           - ruby: '2.6'
             gemfile: rails_7_1
     env:
@@ -158,15 +170,21 @@ jobs:
           - ruby: '3.0'
             gemfile: rails_5_2
 
-          # Rails 7 requires Ruby 2.7 or higher
+          # Rails 8 requires Ruby 3.1 or higher
           - ruby: '2.6'
-            gemfile: rails_7_0
-          
+            gemfile: rails_main
+
+          - ruby: '2.7'
+            gemfile: rails_main
+
+          - ruby: '3.0'
+            gemfile: rails_main
+
           - ruby: '2.6'
-            gemfile: rails_7_1
+            gemfile: rails_7_0
 
           - ruby: '2.6'
-            gemfile: rails_main
+            gemfile: rails_7_1
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
       BUNDLE_PATH_RELATIVE_TO_CWD: true