diff --git a/.github/workflows/generators.yml b/.github/workflows/generators.yml
index cde5d4e..7c8e5ae 100644
--- a/.github/workflows/generators.yml
+++ b/.github/workflows/generators.yml
@@ -47,8 +47,6 @@ jobs:
 
       - name: Run generator tests
         run: bundle exec rspec --tag type:generator
-        env:
-          RAILS_VERSION: ${{ matrix.rails }}
 
       - name: Set up Node
         uses: actions/setup-node@v4
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index cf1fb38..d60c964 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -33,8 +33,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.1', '3.2', '3.3']
-        rails: ['6.1', '7.0', '7.1', '7.2']
+        ruby: ['3.0', '3.1', '3.2', '3.3']
+        rails: ['6.1', '7.0', '7.1', '7.2', '8.0']
+        exclude:
+          - ruby: '3.0'
+            rails: '8.0'
+          - ruby: '3.1'
+            rails: '8.0'
+          - ruby: '3.0'
+            rails: '7.2'
+          - ruby: '3.1'
+            rails: '7.2'
 
     runs-on: ubuntu-latest
     name: Test against Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
@@ -54,6 +63,9 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          # Use the latest version of RubyGems with Ruby 3.0 to avoid:
+          # https://bugs.ruby-lang.org/issues/19371
+          rubygems: ${{ startsWith(matrix.ruby-version, '3.0') && 'latest' || 'default' }}
           bundler-cache: true
         env:
           RAILS_VERSION:  ${{ matrix.rails }}
diff --git a/Gemfile b/Gemfile
index e1b3572..191756a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in inertia_rails.gemspec
 gemspec
 
-version = ENV['RAILS_VERSION'] || '7.2'
+version = ENV['RAILS_VERSION'] || '8.0'
 gem 'rails', "~> #{version}.0"
 
 gem 'bundler', '~> 2.0'