diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 338243b..53214a5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,25 +14,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rails_version: ['5.2', '6.0', '6.1', '7.0', 'main']
-        ruby_version: ['2.5', '2.6', '2.7', '3.0', '3.1']
+        rails_version: ['7.0', '7.1', '7.2', '8.0', 'main']
+        ruby_version: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
         exclude:
-          - rails_version: '5.2'
+          - rails_version: '7.2'
+            ruby_version: '2.7'
+          - rails_version: '7.2'
             ruby_version: '3.0'
-          - rails_version: '5.2'
-            ruby_version: '3.1'
-          - rails_version: '6.0'
+          - rails_version: '8.0'
+            ruby_version: '2.7'
+          - rails_version: '8.0'
             ruby_version: '3.0'
-          - rails_version: '6.0'
+          - rails_version: '8.0'
             ruby_version: '3.1'
-          - rails_version: '7.0'
-            ruby_version: '2.5'
-          - rails_version: '7.0'
-            ruby_version: '2.6'
           - rails_version: 'main'
-            ruby_version: '2.5'
+            ruby_version: '2.7'
+          - rails_version: 'main'
+            ruby_version: '3.0'
           - rails_version: 'main'
-            ruby_version: '2.6'
+            ruby_version: '3.1'
     env:
       BUNDLE_PATH: ${{ github.workspace }}/vendor/bundle
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}.gemfile
diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
deleted file mode 100644
index 2296b7d..0000000
--- a/gemfiles/rails_6.1.gemfile
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 6.1.0"
-gem "net-smtp", require: false
-gem "net-imap", require: false
-gem "net-pop", require: false
-
-gemspec path: "../"
diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
index 9af0ae3..86c9d6a 100644
--- a/gemfiles/rails_7.0.gemfile
+++ b/gemfiles/rails_7.0.gemfile
@@ -3,5 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 7.0.0"
+gem "concurrent-ruby", ">= 1.3.4"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_7.1.gemfile
similarity index 79%
rename from gemfiles/rails_6.0.gemfile
rename to gemfiles/rails_7.1.gemfile
index 15b9b27..35a0ba3 100644
--- a/gemfiles/rails_6.0.gemfile
+++ b/gemfiles/rails_7.1.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"
diff --git a/gemfiles/rails_7.2.gemfile b/gemfiles/rails_7.2.gemfile
new file mode 100644
index 0000000..92cc2b2
--- /dev/null
+++ b/gemfiles/rails_7.2.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.2.0"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_8.0.gemfile b/gemfiles/rails_8.0.gemfile
new file mode 100644
index 0000000..3b3765b
--- /dev/null
+++ b/gemfiles/rails_8.0.gemfile
@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 8.0.0"
+
+gemspec path: "../"
diff --git a/viewcomponent-rspec.gemspec b/viewcomponent-rspec.gemspec
index faaecb1..5267f94 100644
--- a/viewcomponent-rspec.gemspec
+++ b/viewcomponent-rspec.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activesupport", [">= 5.0.0", "< 8.0"]
+  spec.add_runtime_dependency "activesupport", [">= 5.0.0", "< 9.0"]
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "capybara", "~> 3"
@@ -39,5 +39,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec-rails", "~> 5"
   spec.add_development_dependency "standard", "~> 1.3"
-  spec.add_development_dependency "view_component", "~> 2"
+  spec.add_development_dependency "view_component", "~> 2.0"
 end