diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1abe7f1a..84cc9d9b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,9 @@ jobs:
           - 2.5
           - 2.6
           - 2.7
-          - 3.0.0-preview1
+          - 3.0
+          - 3.1
+          - 3.2
           # - truffleruby-head
         gemfile:
           # These are located in the gemfiles/ folder
@@ -32,6 +34,7 @@ jobs:
           - rails52
           - rails60
           - rails61
+          - rails70
           - rails42_haml
           - rails50_haml
           - rails51_haml
@@ -44,6 +47,7 @@ jobs:
           - rails52_boc
           - rails60_boc
           - rails61_boc
+          - rails70_boc
           - rack
           - rack_boc
           # - pry09
@@ -58,6 +62,9 @@ jobs:
           - { ruby: 2.2,              gemfile: rails61 }
           - { ruby: 2.2,              gemfile: rails61_boc }
           - { ruby: 2.2,              gemfile: rails61_haml }
+          - { ruby: 2.2,              gemfile: rails70 }
+          - { ruby: 2.2,              gemfile: rails70_boc }
+          - { ruby: 2.2,              gemfile: rails70_haml }
           - { ruby: 2.3,              gemfile: rails42 }
           - { ruby: 2.3,              gemfile: rails42_boc }
           - { ruby: 2.3,              gemfile: rails42_haml }
@@ -67,6 +74,9 @@ jobs:
           - { ruby: 2.3,              gemfile: rails61 }
           - { ruby: 2.3,              gemfile: rails61_boc }
           - { ruby: 2.3,              gemfile: rails61_haml }
+          - { ruby: 2.3,              gemfile: rails70 }
+          - { ruby: 2.3,              gemfile: rails70_boc }
+          - { ruby: 2.3,              gemfile: rails70_haml }
           - { ruby: 2.4,              gemfile: rails42 }
           - { ruby: 2.4,              gemfile: rails42_boc }
           - { ruby: 2.4,              gemfile: rails42_haml }
@@ -76,9 +86,15 @@ jobs:
           - { ruby: 2.4,              gemfile: rails61 }
           - { ruby: 2.4,              gemfile: rails61_boc }
           - { ruby: 2.4,              gemfile: rails61_haml }
+          - { ruby: 2.4,              gemfile: rails70 }
+          - { ruby: 2.4,              gemfile: rails70_boc }
+          - { ruby: 2.4,              gemfile: rails70_haml }
           - { ruby: 2.5,              gemfile: rails42 }
           - { ruby: 2.5,              gemfile: rails42_boc }
           - { ruby: 2.5,              gemfile: rails42_haml }
+          - { ruby: 2.5,              gemfile: rails70 }
+          - { ruby: 2.5,              gemfile: rails70_boc }
+          - { ruby: 2.5,              gemfile: rails70_haml }
           - { ruby: 2.5,              gemfile: rails50 }
           - { ruby: 2.5,              gemfile: rails50_boc }
           - { ruby: 2.5,              gemfile: rails50_haml }
@@ -97,6 +113,9 @@ jobs:
           - { ruby: 2.6,              gemfile: rails60 }
           - { ruby: 2.6,              gemfile: rails60_boc }
           - { ruby: 2.6,              gemfile: rails60_haml }
+          - { ruby: 2.6,              gemfile: rails70 }
+          - { ruby: 2.6,              gemfile: rails70_boc }
+          - { ruby: 2.6,              gemfile: rails70_haml }
           - { ruby: 2.7,              gemfile: rails42 }
           - { ruby: 2.7,              gemfile: rails42_boc }
           - { ruby: 2.7,              gemfile: rails42_haml }
@@ -112,26 +131,58 @@ jobs:
           - { ruby: 2.7,              gemfile: rails60 }
           - { ruby: 2.7,              gemfile: rails60_boc }
           - { ruby: 2.7,              gemfile: rails60_haml }
-          - { ruby: 3.0.0-preview1,   gemfile: rails42 }
-          - { ruby: 3.0.0-preview1,   gemfile: rails42_boc }
-          - { ruby: 3.0.0-preview1,   gemfile: rails42_haml }
-          - { ruby: 3.0.0-preview1,   gemfile: rails50 }
-          - { ruby: 3.0.0-preview1,   gemfile: rails50_boc }
-          - { ruby: 3.0.0-preview1,   gemfile: rails50_haml }
-          - { ruby: 3.0.0-preview1,   gemfile: rails51 }
-          - { ruby: 3.0.0-preview1,   gemfile: rails51_boc }
-          - { ruby: 3.0.0-preview1,   gemfile: rails51_haml }
-          - { ruby: 3.0.0-preview1,   gemfile: rails52 }
-          - { ruby: 3.0.0-preview1,   gemfile: rails52_boc }
-          - { ruby: 3.0.0-preview1,   gemfile: rails52_haml }
-          - { ruby: 3.0.0-preview1,   gemfile: rails60 }
-          - { ruby: 3.0.0-preview1,   gemfile: rails60_boc }
-          - { ruby: 3.0.0-preview1,   gemfile: rails60_haml }
+          - { ruby: 3.0,              gemfile: rails42 }
+          - { ruby: 3.0,              gemfile: rails42_boc }
+          - { ruby: 3.0,              gemfile: rails42_haml }
+          - { ruby: 3.0,              gemfile: rails50 }
+          - { ruby: 3.0,              gemfile: rails50_boc }
+          - { ruby: 3.0,              gemfile: rails50_haml }
+          - { ruby: 3.0,              gemfile: rails51 }
+          - { ruby: 3.0,              gemfile: rails51_boc }
+          - { ruby: 3.0,              gemfile: rails51_haml }
+          - { ruby: 3.0,              gemfile: rails52 }
+          - { ruby: 3.0,              gemfile: rails52_boc }
+          - { ruby: 3.0,              gemfile: rails52_haml }
+          - { ruby: 3.0,              gemfile: rails60 }
+          - { ruby: 3.0,              gemfile: rails60_boc }
+          - { ruby: 3.0,              gemfile: rails60_haml }
+          - { ruby: 3.1,              gemfile: rails42 }
+          - { ruby: 3.1,              gemfile: rails42_boc }
+          - { ruby: 3.1,              gemfile: rails42_haml }
+          - { ruby: 3.1,              gemfile: rails50 }
+          - { ruby: 3.1,              gemfile: rails50_boc }
+          - { ruby: 3.1,              gemfile: rails50_haml }
+          - { ruby: 3.1,              gemfile: rails51 }
+          - { ruby: 3.1,              gemfile: rails51_boc }
+          - { ruby: 3.1,              gemfile: rails51_haml }
+          - { ruby: 3.1,              gemfile: rails52 }
+          - { ruby: 3.1,              gemfile: rails52_boc }
+          - { ruby: 3.1,              gemfile: rails52_haml }
+          - { ruby: 3.1,              gemfile: rails60 }
+          - { ruby: 3.1,              gemfile: rails60_boc }
+          - { ruby: 3.1,              gemfile: rails60_haml }
+          - { ruby: 3.2,              gemfile: rails42 }
+          - { ruby: 3.2,              gemfile: rails42_boc }
+          - { ruby: 3.2,              gemfile: rails42_haml }
+          - { ruby: 3.2,              gemfile: rails50 }
+          - { ruby: 3.2,              gemfile: rails50_boc }
+          - { ruby: 3.2,              gemfile: rails50_haml }
+          - { ruby: 3.2,              gemfile: rails51 }
+          - { ruby: 3.2,              gemfile: rails51_boc }
+          - { ruby: 3.2,              gemfile: rails51_haml }
+          - { ruby: 3.2,              gemfile: rails52 }
+          - { ruby: 3.2,              gemfile: rails52_boc }
+          - { ruby: 3.2,              gemfile: rails52_haml }
+          - { ruby: 3.2,              gemfile: rails60 }
+          - { ruby: 3.2,              gemfile: rails60_boc }
+          - { ruby: 3.2,              gemfile: rails60_haml }
           # - { ruby: truffleruby-head, gemfile: rails42_boc }
           # - { ruby: truffleruby-head, gemfile: rails50_boc }
           # - { ruby: truffleruby-head, gemfile: rails51_boc }
           # - { ruby: truffleruby-head, gemfile: rails52_boc }
           # - { ruby: truffleruby-head, gemfile: rails60_boc }
+          # - { ruby: truffleruby-head, gemfile: rails61_boc }
+          # - { ruby: truffleruby-head, gemfile: rails70_boc }
           # - { ruby: truffleruby-head, gemfile: rack_boc }
 
     steps:
diff --git a/better_errors.gemspec b/better_errors.gemspec
index 04f74331..953f332e 100644
--- a/better_errors.gemspec
+++ b/better_errors.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.0.0"
 
-  s.add_development_dependency "rake", "~> 10.0"
+  s.add_development_dependency "rake", ">= 10.0"
   s.add_development_dependency "rspec", "~> 3.5"
   s.add_development_dependency "rspec-html-matchers"
   s.add_development_dependency "rspec-its"
diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfile
index d185530c..6cb569ae 100644
--- a/gemfiles/rails61.gemfile
+++ b/gemfiles/rails61.gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 6.1.0rc"
+gem "rails", "~> 6.1.0"
 
 gem 'simplecov',      require: false
 gem 'simplecov-lcov', require: false
diff --git a/gemfiles/rails61_boc.gemfile b/gemfiles/rails61_boc.gemfile
index 50442047..a90df3e8 100644
--- a/gemfiles/rails61_boc.gemfile
+++ b/gemfiles/rails61_boc.gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 6.1.0rc"
+gem "rails", "~> 6.1.0"
 gem "binding_of_caller"
 
 gem 'simplecov',      require: false
diff --git a/gemfiles/rails61_haml.gemfile b/gemfiles/rails61_haml.gemfile
index 6685996f..16e70991 100644
--- a/gemfiles/rails61_haml.gemfile
+++ b/gemfiles/rails61_haml.gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 6.1.0rc"
+gem "rails", "~> 6.1.0"
 gem "haml"
 
 gem 'simplecov',      require: false
diff --git a/gemfiles/rails70.gemfile b/gemfiles/rails70.gemfile
new file mode 100644
index 00000000..b942a581
--- /dev/null
+++ b/gemfiles/rails70.gemfile
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.0"
+
+gem 'simplecov',      require: false
+gem 'simplecov-lcov', require: false
+
+gemspec path: "../"
diff --git a/gemfiles/rails70_boc.gemfile b/gemfiles/rails70_boc.gemfile
new file mode 100644
index 00000000..195c010f
--- /dev/null
+++ b/gemfiles/rails70_boc.gemfile
@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.0"
+gem "binding_of_caller"
+
+gem 'simplecov',      require: false
+gem 'simplecov-lcov', require: false
+
+gemspec path: "../"
diff --git a/gemfiles/rails70_haml.gemfile b/gemfiles/rails70_haml.gemfile
new file mode 100644
index 00000000..563e2bd1
--- /dev/null
+++ b/gemfiles/rails70_haml.gemfile
@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.0"
+gem "haml"
+
+gem 'simplecov',      require: false
+gem 'simplecov-lcov', require: false
+
+gemspec path: "../"