diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index a58c402..3326023 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -28,6 +28,10 @@ jobs:
             ruby: '3.3'
           - gemfile: rails-7.2-propshaft
             ruby: '3.3'
+          - gemfile: rails-8.0
+            ruby: '3.3'
+          - gemfile: rails-8.0-propshaft
+            ruby: '3.3'
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
diff --git a/gemfiles/rails-7.2-propshaft.gemfile b/gemfiles/rails-7.2-propshaft.gemfile
index 8502266..a3b7f78 100644
--- a/gemfiles/rails-7.2-propshaft.gemfile
+++ b/gemfiles/rails-7.2-propshaft.gemfile
@@ -7,7 +7,7 @@ group :test do
   gem "capybara"
 end
 
-gem "rails", "~> 7.2.0.rc1"
+gem "rails", "~> 7.2.0"
 gem "propshaft"
 gem "sqlite3", "~> 1.4"
 gem "devise"
diff --git a/gemfiles/rails-7.2.gemfile b/gemfiles/rails-7.2.gemfile
index bd86c96..ef656df 100644
--- a/gemfiles/rails-7.2.gemfile
+++ b/gemfiles/rails-7.2.gemfile
@@ -7,7 +7,7 @@ group :test do
   gem "capybara"
 end
 
-gem "rails", "~> 7.2.0.rc1"
+gem "rails", "~> 7.2.0"
 gem "sprockets-rails"
 gem "sqlite3", "~> 1.4"
 gem "devise"
diff --git a/gemfiles/rails-8.0-propshaft.gemfile b/gemfiles/rails-8.0-propshaft.gemfile
new file mode 100644
index 0000000..520f956
--- /dev/null
+++ b/gemfiles/rails-8.0-propshaft.gemfile
@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "rspec-rails"
+
+  gem "coveralls_reborn", require: false
+  gem "capybara"
+end
+
+gem "rails", "~> 8.0.0.beta1"
+gem "propshaft"
+gem "sqlite3"
+gem "devise"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"
diff --git a/gemfiles/rails-8.0.gemfile b/gemfiles/rails-8.0.gemfile
new file mode 100644
index 0000000..4f16ac7
--- /dev/null
+++ b/gemfiles/rails-8.0.gemfile
@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem "rspec-rails"
+
+  gem "coveralls_reborn", require: false
+  gem "capybara"
+end
+
+gem "rails", "~> 8.0.0.beta1"
+gem "sprockets-rails"
+gem "sqlite3"
+gem "devise"
+
+gem "trestle", github: "TrestleAdmin/trestle"
+
+gemspec path: "../"