diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e7113e88b..4eecba84d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -10,16 +10,18 @@ env:
   # Default versions for canonical release build
   DEFAULT_JAVA_VERSION: '8'
   DEFAULT_JRUBY_VERSION: '9.4.13.0' # Should match pom.xml <jruby.version> property (AND a version inside the test matrix)
+  DEFAULT_RACK_VERSION: '~> 2.2' # Should match Gemfile (AND a version inside the test matrix)
 
 jobs:
   build:
-    name: JRuby ${{ matrix.jruby_version }} / Java ${{ matrix.java_version }}
+    name: Rack ${{ matrix.rack_version }} on JRuby ${{ matrix.jruby_version }} / Java ${{ matrix.java_version }}
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
         jruby_version: [ '9.4.13.0', '10.0.2.0' ]
         java_version: [ '8', '11', '17', '21' ]
+        rack_version: [ '~> 2.2' ]
         exclude:
           - jruby_version: '10.0.2.0'
             java_version: '8'  # JRuby 10 requires Java 21
@@ -41,31 +43,42 @@ jobs:
 
     - name: Build with Maven
       run: ./mvnw -B install -Djruby.version=${{ matrix.jruby_version }}
+      env:
+        RACK_VERSION: ${{ matrix.rack_version }}
 
     # Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
     - name: Update dependency graph
       uses: advanced-security/maven-dependency-submission-action@b275d12641ac2d2108b2cbb7598b154ad2f2cee8 # v5.0.0
-      if: github.ref == 'refs/heads/master' && matrix.java_version == env.DEFAULT_JAVA_VERSION && matrix.jruby_version == env.DEFAULT_JRUBY_VERSION
+      if: github.ref == 'refs/heads/master' && matrix.java_version == env.DEFAULT_JAVA_VERSION && matrix.jruby_version == env.DEFAULT_JRUBY_VERSION && matrix.rack_version == env.DEFAULT_RACK_VERSION
 
   appraisals:
     needs: build
-    name: ${{ matrix.appraisal }} appraisal on ${{ matrix.jruby_version }} / Java ${{ matrix.java_version }}
+    name: ${{ matrix.appraisal }} on ${{ matrix.jruby_version }} / Java ${{ matrix.java_version }}
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
+        appraisal: [
+          'rails50_rack22',
+          'rails52_rack22',
+          'rails60_rack22',
+          'rails61_rack22',
+          'rails70_rack22',
+          'rails71_rack22',
+          'rails72_rack22',
+          'rails80_rack22',
+        ]
         jruby_version: [ '9.4.13.0', '10.0.2.0' ]
         java_version: [ '8', '11', '17', '21' ]
-        appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72', 'rails80' ]
         exclude:
-          - jruby_version: '9.4.13.0'
-            appraisal: 'rails80' # Requires Ruby 3.4 compatibility, which JRuby 9.4 does not support
           - jruby_version: '10.0.2.0'
             java_version: '8'  # JRuby 10 requires Java 21
           - jruby_version: '10.0.2.0'
             java_version: '11' # JRuby 10 requires Java 21
           - jruby_version: '10.0.2.0'
             java_version: '17' # JRuby 10 requires Java 21
+          - appraisal: 'rails80_rack22'
+            jruby_version: '9.4.13.0' # Rails 8 requires Ruby 3.4 compatibility, which JRuby 9.4 does not support
       fail-fast: false
 
     env:
diff --git a/.gitignore b/.gitignore
index 49637520b..98fa4de4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ examples/*/nbproject
 nbproject
 .idea/
 .rvmrc
+gemfiles/*.lock
\ No newline at end of file
diff --git a/Appraisals b/Appraisals
index 655c29fd7..d23863e35 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,31 +1,24 @@
-appraise "rails50" do
-  gem "rails", "~> 5.0.0"
-end
-
-appraise "rails52" do
-  gem "rails", "~> 5.2.0"
-end
+version_spec = ->(prefix, desc) { "~> #{desc.split(prefix).last.insert(1, ".")}.0" }
 
-appraise "rails60" do
-  gem "rails", "~> 6.0.0"
-end
-
-appraise "rails61" do
-  gem "rails", "~> 6.1.0"
-end
+# Rails version -> rack versions in format
+# rails#{MAJOR}#{MINOR} => %w[ rack#{MAJOR}#{MINOR} ]
+{
+    "rails50" => %w[rack22],
+    "rails52" => %w[rack22],
+    "rails60" => %w[rack22],
+    "rails61" => %w[rack22],
+    "rails70" => %w[rack22],
+    "rails71" => %w[rack22],
+    "rails72" => %w[rack22],
+    "rails80" => %w[rack22]
+}.each do |rails_desc, rack_descs|
+  rack_descs.each do |rack_desc|
 
-appraise "rails70" do
-  gem "rails", "~> 7.0.0"
+    appraise "#{rails_desc}_#{rack_desc}" do
+      group :default do
+        gem "rack", version_spec.call("rack", rack_desc)
+        gem "rails", version_spec.call("rails", rails_desc)
+      end
+    end
+  end
 end
-
-appraise "rails71" do
-  gem "rails", "~> 7.1.0"
-end
-
-appraise "rails72" do
-  gem "rails", "~> 7.2.0"
-end
-
-appraise "rails80" do
-  gem "rails", "~> 8.0.0"
-end
\ No newline at end of file
diff --git a/gemfiles/rails50.gemfile.lock b/gemfiles/rails50.gemfile.lock
deleted file mode 100644
index 4c0e0aeca..000000000
--- a/gemfiles/rails50.gemfile.lock
+++ /dev/null
@@ -1,151 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.7.2)
-      actionview (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.7.2)
-      activesupport (= 5.0.7.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.7.2)
-      activesupport (= 5.0.7.2)
-      globalid (>= 0.3.6)
-    activemodel (5.0.7.2)
-      activesupport (= 5.0.7.2)
-    activerecord (5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      arel (~> 7.0)
-    activesupport (5.0.7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (7.1.4)
-    builder (3.3.0)
-    concurrent-ruby (1.3.5)
-    crass (1.0.6)
-    date (3.4.1-java)
-    diff-lcs (1.6.2)
-    erubis (2.7.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    logger (1.7.0)
-    loofah (2.24.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    method_source (1.1.0)
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    net-imap (0.5.9)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.4-java)
-    nokogiri (1.18.9-java)
-      racc (~> 1.4)
-    racc (1.8.1-java)
-    rack (2.2.17)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.7.2)
-      actioncable (= 5.0.7.2)
-      actionmailer (= 5.0.7.2)
-      actionpack (= 5.0.7.2)
-      actionview (= 5.0.7.2)
-      activejob (= 5.0.7.2)
-      activemodel (= 5.0.7.2)
-      activerecord (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      bundler (>= 1.3.0)
-      railties (= 5.0.7.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (5.0.7.2)
-      actionpack (= 5.0.7.2)
-      activesupport (= 5.0.7.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (13.3.0)
-    rspec (3.13.1)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    sprockets (4.2.2)
-      concurrent-ruby (~> 1.0)
-      logger
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    thor (1.4.0)
-    thread_safe (0.3.6-java)
-    timeout (0.4.3)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
-    websocket-driver (0.6.5-java)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-
-PLATFORMS
-  universal-java-1.8
-  universal-java-11
-  universal-java-17
-  universal-java-21
-
-DEPENDENCIES
-  appraisal
-  rack (~> 2.2)
-  rails (~> 5.0.0)
-  rake (~> 13.3)
-  rspec
diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50_rack22.gemfile
similarity index 81%
rename from gemfiles/rails50.gemfile
rename to gemfiles/rails50_rack22.gemfile
index 09fffbb90..38c611b35 100644
--- a/gemfiles/rails50.gemfile
+++ b/gemfiles/rails50_rack22.gemfile
@@ -4,10 +4,10 @@ source "https://rubygems.org"
 
 gem "rake", "~> 13.3", group: :test, require: nil
 gem "rspec", group: :test
-gem "rails", "~> 5.0.0"
 
 group :default do
-  gem "rack", "~> 2.2"
+  gem "rack", "~> 2.2.0"
+  gem "rails", "~> 5.0.0"
 end
 
 group :development do
diff --git a/gemfiles/rails52.gemfile.lock b/gemfiles/rails52.gemfile.lock
deleted file mode 100644
index 59e70b493..000000000
--- a/gemfiles/rails52.gemfile.lock
+++ /dev/null
@@ -1,159 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      actionview (= 5.2.8.1)
-      activejob (= 5.2.8.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.8.1)
-      actionview (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.8.1)
-      activesupport (= 5.2.8.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.8.1)
-      activesupport (= 5.2.8.1)
-      globalid (>= 0.3.6)
-    activemodel (5.2.8.1)
-      activesupport (= 5.2.8.1)
-    activerecord (5.2.8.1)
-      activemodel (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      arel (>= 9.0)
-    activestorage (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      activerecord (= 5.2.8.1)
-      marcel (~> 1.0.0)
-    activesupport (5.2.8.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    arel (9.0.0)
-    base64 (0.3.0)
-    builder (3.3.0)
-    concurrent-ruby (1.3.5)
-    crass (1.0.6)
-    date (3.4.1-java)
-    diff-lcs (1.6.2)
-    erubi (1.13.1)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    logger (1.7.0)
-    loofah (2.24.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    method_source (1.1.0)
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    net-imap (0.5.9)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.4-java)
-    nokogiri (1.18.9-java)
-      racc (~> 1.4)
-    racc (1.8.1-java)
-    rack (2.2.17)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rails (5.2.8.1)
-      actioncable (= 5.2.8.1)
-      actionmailer (= 5.2.8.1)
-      actionpack (= 5.2.8.1)
-      actionview (= 5.2.8.1)
-      activejob (= 5.2.8.1)
-      activemodel (= 5.2.8.1)
-      activerecord (= 5.2.8.1)
-      activestorage (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      bundler (>= 1.3.0)
-      railties (= 5.2.8.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (5.2.8.1)
-      actionpack (= 5.2.8.1)
-      activesupport (= 5.2.8.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (13.3.0)
-    rspec (3.13.1)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    sprockets (4.2.2)
-      concurrent-ruby (~> 1.0)
-      logger
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    thor (1.4.0)
-    thread_safe (0.3.6-java)
-    timeout (0.4.3)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
-    websocket-driver (0.8.0-java)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-
-PLATFORMS
-  universal-java-1.8
-  universal-java-11
-  universal-java-17
-  universal-java-21
-
-DEPENDENCIES
-  appraisal
-  rack (~> 2.2)
-  rails (~> 5.2.0)
-  rake (~> 13.3)
-  rspec
diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails52_rack22.gemfile
similarity index 81%
rename from gemfiles/rails60.gemfile
rename to gemfiles/rails52_rack22.gemfile
index 5d0e9dbe1..3936b45c3 100644
--- a/gemfiles/rails60.gemfile
+++ b/gemfiles/rails52_rack22.gemfile
@@ -4,10 +4,10 @@ source "https://rubygems.org"
 
 gem "rake", "~> 13.3", group: :test, require: nil
 gem "rspec", group: :test
-gem "rails", "~> 6.0.0"
 
 group :default do
-  gem "rack", "~> 2.2"
+  gem "rack", "~> 2.2.0"
+  gem "rails", "~> 5.2.0"
 end
 
 group :development do
diff --git a/gemfiles/rails60.gemfile.lock b/gemfiles/rails60.gemfile.lock
deleted file mode 100644
index 1070db9a2..000000000
--- a/gemfiles/rails60.gemfile.lock
+++ /dev/null
@@ -1,175 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      mail (>= 2.7.1)
-    actionmailer (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      actionview (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.6.1)
-      actionview (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      rack (~> 2.0, >= 2.0.8)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.6.1)
-      activesupport (= 6.0.6.1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.6.1)
-      activesupport (= 6.0.6.1)
-      globalid (>= 0.3.6)
-    activemodel (6.0.6.1)
-      activesupport (= 6.0.6.1)
-    activerecord (6.0.6.1)
-      activemodel (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-    activestorage (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      marcel (~> 1.0)
-    activesupport (6.0.6.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    base64 (0.3.0)
-    builder (3.3.0)
-    concurrent-ruby (1.3.5)
-    crass (1.0.6)
-    date (3.4.1-java)
-    diff-lcs (1.6.2)
-    erubi (1.13.1)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    logger (1.7.0)
-    loofah (2.24.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    method_source (1.1.0)
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    net-imap (0.5.9)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.4-java)
-    nokogiri (1.18.9-java)
-      racc (~> 1.4)
-    racc (1.8.1-java)
-    rack (2.2.17)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rails (6.0.6.1)
-      actioncable (= 6.0.6.1)
-      actionmailbox (= 6.0.6.1)
-      actionmailer (= 6.0.6.1)
-      actionpack (= 6.0.6.1)
-      actiontext (= 6.0.6.1)
-      actionview (= 6.0.6.1)
-      activejob (= 6.0.6.1)
-      activemodel (= 6.0.6.1)
-      activerecord (= 6.0.6.1)
-      activestorage (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.6.1)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (6.0.6.1)
-      actionpack (= 6.0.6.1)
-      activesupport (= 6.0.6.1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.3.0)
-    rspec (3.13.1)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    sprockets (4.2.2)
-      concurrent-ruby (~> 1.0)
-      logger
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    thor (1.4.0)
-    thread_safe (0.3.6-java)
-    timeout (0.4.3)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
-    websocket-driver (0.8.0-java)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.18)
-
-PLATFORMS
-  universal-java-1.8
-  universal-java-11
-  universal-java-17
-  universal-java-21
-
-DEPENDENCIES
-  appraisal
-  rack (~> 2.2)
-  rails (~> 6.0.0)
-  rake (~> 13.3)
-  rspec
diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails60_rack22.gemfile
similarity index 81%
rename from gemfiles/rails52.gemfile
rename to gemfiles/rails60_rack22.gemfile
index 3f44ae91c..bb01c8595 100644
--- a/gemfiles/rails52.gemfile
+++ b/gemfiles/rails60_rack22.gemfile
@@ -4,10 +4,10 @@ source "https://rubygems.org"
 
 gem "rake", "~> 13.3", group: :test, require: nil
 gem "rspec", group: :test
-gem "rails", "~> 5.2.0"
 
 group :default do
-  gem "rack", "~> 2.2"
+  gem "rack", "~> 2.2.0"
+  gem "rails", "~> 6.0.0"
 end
 
 group :development do
diff --git a/gemfiles/rails61.gemfile.lock b/gemfiles/rails61.gemfile.lock
deleted file mode 100644
index 3d45bdfdb..000000000
--- a/gemfiles/rails61.gemfile.lock
+++ /dev/null
@@ -1,178 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (6.1.7.10)
-      actionpack (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.10)
-      actionpack (= 6.1.7.10)
-      activejob (= 6.1.7.10)
-      activerecord (= 6.1.7.10)
-      activestorage (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-      mail (>= 2.7.1)
-    actionmailer (6.1.7.10)
-      actionpack (= 6.1.7.10)
-      actionview (= 6.1.7.10)
-      activejob (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.10)
-      actionview (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-      rack (~> 2.0, >= 2.0.9)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.10)
-      actionpack (= 6.1.7.10)
-      activerecord (= 6.1.7.10)
-      activestorage (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-      nokogiri (>= 1.8.5)
-    actionview (6.1.7.10)
-      activesupport (= 6.1.7.10)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.10)
-      activesupport (= 6.1.7.10)
-      globalid (>= 0.3.6)
-    activemodel (6.1.7.10)
-      activesupport (= 6.1.7.10)
-    activerecord (6.1.7.10)
-      activemodel (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-    activestorage (6.1.7.10)
-      actionpack (= 6.1.7.10)
-      activejob (= 6.1.7.10)
-      activerecord (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-      marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (6.1.7.10)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    base64 (0.3.0)
-    builder (3.3.0)
-    concurrent-ruby (1.3.5)
-    crass (1.0.6)
-    date (3.4.1-java)
-    diff-lcs (1.6.2)
-    erubi (1.13.1)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    logger (1.7.0)
-    loofah (2.24.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    method_source (1.1.0)
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    net-imap (0.5.9)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.4-java)
-    nokogiri (1.18.9-java)
-      racc (~> 1.4)
-    racc (1.8.1-java)
-    rack (2.2.17)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rails (6.1.7.10)
-      actioncable (= 6.1.7.10)
-      actionmailbox (= 6.1.7.10)
-      actionmailer (= 6.1.7.10)
-      actionpack (= 6.1.7.10)
-      actiontext (= 6.1.7.10)
-      actionview (= 6.1.7.10)
-      activejob (= 6.1.7.10)
-      activemodel (= 6.1.7.10)
-      activerecord (= 6.1.7.10)
-      activestorage (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-      bundler (>= 1.15.0)
-      railties (= 6.1.7.10)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (6.1.7.10)
-      actionpack (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-    rake (13.3.0)
-    rspec (3.13.1)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    sprockets (4.2.2)
-      concurrent-ruby (~> 1.0)
-      logger
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.5.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
-    thor (1.4.0)
-    timeout (0.4.3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    websocket-driver (0.8.0-java)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.18)
-
-PLATFORMS
-  universal-java-1.8
-  universal-java-11
-  universal-java-17
-  universal-java-21
-
-DEPENDENCIES
-  appraisal
-  rack (~> 2.2)
-  rails (~> 6.1.0)
-  rake (~> 13.3)
-  rspec
diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61_rack22.gemfile
similarity index 81%
rename from gemfiles/rails61.gemfile
rename to gemfiles/rails61_rack22.gemfile
index b6f80de84..9aedc1049 100644
--- a/gemfiles/rails61.gemfile
+++ b/gemfiles/rails61_rack22.gemfile
@@ -4,10 +4,10 @@ source "https://rubygems.org"
 
 gem "rake", "~> 13.3", group: :test, require: nil
 gem "rspec", group: :test
-gem "rails", "~> 6.1.0"
 
 group :default do
-  gem "rack", "~> 2.2"
+  gem "rack", "~> 2.2.0"
+  gem "rails", "~> 6.1.0"
 end
 
 group :development do
diff --git a/gemfiles/rails70.gemfile b/gemfiles/rails70.gemfile
deleted file mode 100644
index f4f4a5e3e..000000000
--- a/gemfiles/rails70.gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake", "~> 13.3", group: :test, require: nil
-gem "rspec", group: :test
-gem "rails", "~> 7.0.0"
-
-group :default do
-  gem "rack", "~> 2.2"
-end
-
-group :development do
-  gem "appraisal", require: nil
-end
diff --git a/gemfiles/rails70.gemfile.lock b/gemfiles/rails70.gemfile.lock
deleted file mode 100644
index 008320678..000000000
--- a/gemfiles/rails70.gemfile.lock
+++ /dev/null
@@ -1,175 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      activejob (= 7.0.8.7)
-      activerecord (= 7.0.8.7)
-      activestorage (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      actionview (= 7.0.8.7)
-      activejob (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.7)
-      actionview (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-      rack (~> 2.0, >= 2.2.4)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      activerecord (= 7.0.8.7)
-      activestorage (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.0.8.7)
-      activesupport (= 7.0.8.7)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.8.7)
-      activesupport (= 7.0.8.7)
-      globalid (>= 0.3.6)
-    activemodel (7.0.8.7)
-      activesupport (= 7.0.8.7)
-    activerecord (7.0.8.7)
-      activemodel (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-    activestorage (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      activejob (= 7.0.8.7)
-      activerecord (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-      marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.8.7)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    base64 (0.3.0)
-    builder (3.3.0)
-    concurrent-ruby (1.3.5)
-    crass (1.0.6)
-    date (3.4.1-java)
-    diff-lcs (1.6.2)
-    erubi (1.13.1)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    loofah (2.24.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    method_source (1.1.0)
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    net-imap (0.5.9)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.4-java)
-    nokogiri (1.18.9-java)
-      racc (~> 1.4)
-    racc (1.8.1-java)
-    rack (2.2.17)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rails (7.0.8.7)
-      actioncable (= 7.0.8.7)
-      actionmailbox (= 7.0.8.7)
-      actionmailer (= 7.0.8.7)
-      actionpack (= 7.0.8.7)
-      actiontext (= 7.0.8.7)
-      actionview (= 7.0.8.7)
-      activejob (= 7.0.8.7)
-      activemodel (= 7.0.8.7)
-      activerecord (= 7.0.8.7)
-      activestorage (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-      bundler (>= 1.15.0)
-      railties (= 7.0.8.7)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.0.8.7)
-      actionpack (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
-    rake (13.3.0)
-    rspec (3.13.1)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    thor (1.4.0)
-    timeout (0.4.3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    websocket-driver (0.8.0-java)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.18)
-
-PLATFORMS
-  universal-java-1.8
-  universal-java-11
-  universal-java-17
-  universal-java-21
-
-DEPENDENCIES
-  appraisal
-  rack (~> 2.2)
-  rails (~> 7.0.0)
-  rake (~> 13.3)
-  rspec
diff --git a/gemfiles/rails70_rack22.gemfile b/gemfiles/rails70_rack22.gemfile
new file mode 100644
index 000000000..a7dc34688
--- /dev/null
+++ b/gemfiles/rails70_rack22.gemfile
@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.3", group: :test, require: nil
+gem "rspec", group: :test
+
+group :default do
+  gem "rack", "~> 2.2.0"
+  gem "rails", "~> 7.0.0"
+end
+
+group :development do
+  gem "appraisal", require: nil
+end
diff --git a/gemfiles/rails71.gemfile b/gemfiles/rails71.gemfile
deleted file mode 100644
index dc9897870..000000000
--- a/gemfiles/rails71.gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake", "~> 13.3", group: :test, require: nil
-gem "rspec", group: :test
-gem "rails", "~> 7.1.0"
-
-group :default do
-  gem "rack", "~> 2.2"
-end
-
-group :development do
-  gem "appraisal", require: nil
-end
diff --git a/gemfiles/rails71.gemfile.lock b/gemfiles/rails71.gemfile.lock
deleted file mode 100644
index a5e80f98e..000000000
--- a/gemfiles/rails71.gemfile.lock
+++ /dev/null
@@ -1,220 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      actionview (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.2)
-    actionpack (7.1.5.2)
-      actionview (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.1.5.2)
-      activesupport (= 7.1.5.2)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (7.1.5.2)
-      activesupport (= 7.1.5.2)
-      globalid (>= 0.3.6)
-    activemodel (7.1.5.2)
-      activesupport (= 7.1.5.2)
-    activerecord (7.1.5.2)
-      activemodel (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      timeout (>= 0.4.0)
-    activestorage (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      marcel (~> 1.0)
-    activesupport (7.1.5.2)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      mutex_m
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2-java)
-    builder (3.3.0)
-    cgi (0.5.0-java)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
-    crass (1.0.6)
-    date (3.4.1-java)
-    diff-lcs (1.6.2)
-    drb (2.2.3)
-    erb (4.0.4-java)
-      cgi (>= 0.3.3)
-    erubi (1.13.1)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.1-java)
-    irb (1.15.2)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    jar-dependencies (0.5.5)
-    logger (1.7.0)
-    loofah (2.24.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    mutex_m (0.3.0)
-    net-imap (0.5.9)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.4-java)
-    nokogiri (1.18.9-java)
-      racc (~> 1.4)
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
-    psych (5.2.6-java)
-      date
-      jar-dependencies (>= 0.1.7)
-    racc (1.8.1-java)
-    rack (2.2.17)
-    rack-session (1.0.2)
-      rack (< 3)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
-    rails (7.1.5.2)
-      actioncable (= 7.1.5.2)
-      actionmailbox (= 7.1.5.2)
-      actionmailer (= 7.1.5.2)
-      actionpack (= 7.1.5.2)
-      actiontext (= 7.1.5.2)
-      actionview (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activemodel (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      bundler (>= 1.15.0)
-      railties (= 7.1.5.2)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      irb
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-    rake (13.3.0)
-    rdoc (6.14.2)
-      erb
-      psych (>= 4.0.0)
-    reline (0.6.2)
-      io-console (~> 0.5)
-    rspec (3.13.1)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    securerandom (0.4.1)
-    thor (1.4.0)
-    timeout (0.4.3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    webrick (1.9.1)
-    websocket-driver (0.8.0-java)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.18)
-
-PLATFORMS
-  universal-java-1.8
-  universal-java-11
-  universal-java-17
-  universal-java-21
-
-DEPENDENCIES
-  appraisal
-  rack (~> 2.2)
-  rails (~> 7.1.0)
-  rake (~> 13.3)
-  rspec
diff --git a/gemfiles/rails71_rack22.gemfile b/gemfiles/rails71_rack22.gemfile
new file mode 100644
index 000000000..e87008952
--- /dev/null
+++ b/gemfiles/rails71_rack22.gemfile
@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.3", group: :test, require: nil
+gem "rspec", group: :test
+
+group :default do
+  gem "rack", "~> 2.2.0"
+  gem "rails", "~> 7.1.0"
+end
+
+group :development do
+  gem "appraisal", require: nil
+end
diff --git a/gemfiles/rails72.gemfile b/gemfiles/rails72.gemfile
deleted file mode 100644
index 602c07f2e..000000000
--- a/gemfiles/rails72.gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake", "~> 13.3", group: :test, require: nil
-gem "rspec", group: :test
-gem "rails", "~> 7.2.0"
-
-group :default do
-  gem "rack", "~> 2.2"
-end
-
-group :development do
-  gem "appraisal", require: nil
-end
diff --git a/gemfiles/rails72.gemfile.lock b/gemfiles/rails72.gemfile.lock
deleted file mode 100644
index 09fd579f4..000000000
--- a/gemfiles/rails72.gemfile.lock
+++ /dev/null
@@ -1,214 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
-      mail (>= 2.8.0)
-    actionmailer (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
-      mail (>= 2.8.0)
-      rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.2)
-      actionview (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
-      nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.2.2.2)
-      activesupport (= 7.2.2.2)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (7.2.2.2)
-      activesupport (= 7.2.2.2)
-      globalid (>= 0.3.6)
-    activemodel (7.2.2.2)
-      activesupport (= 7.2.2.2)
-    activerecord (7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
-      timeout (>= 0.4.0)
-    activestorage (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
-      marcel (~> 1.0)
-    activesupport (7.2.2.2)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2-java)
-    builder (3.3.0)
-    cgi (0.5.0-java)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
-    crass (1.0.6)
-    date (3.4.1-java)
-    diff-lcs (1.6.2)
-    drb (2.2.3)
-    erb (4.0.4-java)
-      cgi (>= 0.3.3)
-    erubi (1.13.1)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.1-java)
-    irb (1.15.2)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    jar-dependencies (0.5.5)
-    logger (1.7.0)
-    loofah (2.24.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    net-imap (0.5.9)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.4-java)
-    nokogiri (1.18.9-java)
-      racc (~> 1.4)
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
-    psych (5.2.6-java)
-      date
-      jar-dependencies (>= 0.1.7)
-    racc (1.8.1-java)
-    rack (2.2.17)
-    rack-session (1.0.2)
-      rack (< 3)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
-    rails (7.2.2.2)
-      actioncable (= 7.2.2.2)
-      actionmailbox (= 7.2.2.2)
-      actionmailer (= 7.2.2.2)
-      actionpack (= 7.2.2.2)
-      actiontext (= 7.2.2.2)
-      actionview (= 7.2.2.2)
-      activejob (= 7.2.2.2)
-      activemodel (= 7.2.2.2)
-      activerecord (= 7.2.2.2)
-      activestorage (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
-      bundler (>= 1.15.0)
-      railties (= 7.2.2.2)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.2.2.2)
-      actionpack (= 7.2.2.2)
-      activesupport (= 7.2.2.2)
-      irb (~> 1.13)
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-    rake (13.3.0)
-    rdoc (6.14.2)
-      erb
-      psych (>= 4.0.0)
-    reline (0.6.2)
-      io-console (~> 0.5)
-    rspec (3.13.1)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    securerandom (0.4.1)
-    thor (1.4.0)
-    timeout (0.4.3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    useragent (0.16.11)
-    webrick (1.9.1)
-    websocket-driver (0.8.0-java)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.18)
-
-PLATFORMS
-  universal-java-1.8
-  universal-java-11
-  universal-java-17
-  universal-java-21
-
-DEPENDENCIES
-  appraisal
-  rack (~> 2.2)
-  rails (~> 7.2.0)
-  rake (~> 13.3)
-  rspec
diff --git a/gemfiles/rails72_rack22.gemfile b/gemfiles/rails72_rack22.gemfile
new file mode 100644
index 000000000..33d66ec74
--- /dev/null
+++ b/gemfiles/rails72_rack22.gemfile
@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.3", group: :test, require: nil
+gem "rspec", group: :test
+
+group :default do
+  gem "rack", "~> 2.2.0"
+  gem "rails", "~> 7.2.0"
+end
+
+group :development do
+  gem "appraisal", require: nil
+end
diff --git a/gemfiles/rails80.gemfile b/gemfiles/rails80.gemfile
deleted file mode 100644
index f5afb2d68..000000000
--- a/gemfiles/rails80.gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rake", "~> 13.3", group: :test, require: nil
-gem "rspec", group: :test
-gem "rails", "~> 8.0.0"
-
-group :default do
-  gem "rack", "~> 2.2"
-end
-
-group :development do
-  gem "appraisal", require: nil
-end
diff --git a/gemfiles/rails80.gemfile.lock b/gemfiles/rails80.gemfile.lock
deleted file mode 100644
index f2068c325..000000000
--- a/gemfiles/rails80.gemfile.lock
+++ /dev/null
@@ -1,211 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-      zeitwerk (~> 2.6)
-    actionmailbox (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      activejob (= 8.0.2.1)
-      activerecord (= 8.0.2.1)
-      activestorage (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
-      mail (>= 2.8.0)
-    actionmailer (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      actionview (= 8.0.2.1)
-      activejob (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
-      mail (>= 2.8.0)
-      rails-dom-testing (~> 2.2)
-    actionpack (8.0.2.1)
-      actionview (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
-      nokogiri (>= 1.8.5)
-      rack (>= 2.2.4)
-      rack-session (>= 1.0.1)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-      useragent (~> 0.16)
-    actiontext (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      activerecord (= 8.0.2.1)
-      activestorage (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (8.0.2.1)
-      activesupport (= 8.0.2.1)
-      builder (~> 3.1)
-      erubi (~> 1.11)
-      rails-dom-testing (~> 2.2)
-      rails-html-sanitizer (~> 1.6)
-    activejob (8.0.2.1)
-      activesupport (= 8.0.2.1)
-      globalid (>= 0.3.6)
-    activemodel (8.0.2.1)
-      activesupport (= 8.0.2.1)
-    activerecord (8.0.2.1)
-      activemodel (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
-      timeout (>= 0.4.0)
-    activestorage (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      activejob (= 8.0.2.1)
-      activerecord (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
-      marcel (~> 1.0)
-    activesupport (8.0.2.1)
-      base64
-      benchmark (>= 0.3)
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.3.1)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      logger (>= 1.4.2)
-      minitest (>= 5.1)
-      securerandom (>= 0.3)
-      tzinfo (~> 2.0, >= 2.0.5)
-      uri (>= 0.13.1)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2-java)
-    builder (3.3.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
-    crass (1.0.6)
-    date (3.4.1-java)
-    diff-lcs (1.6.2)
-    drb (2.2.3)
-    erb (5.0.2)
-    erb (5.0.2-java)
-    erubi (1.13.1)
-    globalid (1.2.1)
-      activesupport (>= 6.1)
-    i18n (1.14.7)
-      concurrent-ruby (~> 1.0)
-    io-console (0.8.1-java)
-    irb (1.15.2)
-      pp (>= 0.6.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    jar-dependencies (0.5.5)
-    logger (1.7.0)
-    loofah (2.24.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.12.0)
-    mail (2.8.1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
-    marcel (1.0.4)
-    mini_mime (1.1.5)
-    minitest (5.25.5)
-    net-imap (0.5.9)
-      date
-      net-protocol
-    net-pop (0.1.2)
-      net-protocol
-    net-protocol (0.2.2)
-      timeout
-    net-smtp (0.5.1)
-      net-protocol
-    nio4r (2.7.4-java)
-    nokogiri (1.18.9-java)
-      racc (~> 1.4)
-    pp (0.6.2)
-      prettyprint
-    prettyprint (0.2.0)
-    psych (5.2.6-java)
-      date
-      jar-dependencies (>= 0.1.7)
-    racc (1.8.1-java)
-    rack (2.2.17)
-    rack-session (1.0.2)
-      rack (< 3)
-    rack-test (2.2.0)
-      rack (>= 1.3)
-    rackup (1.0.1)
-      rack (< 3)
-      webrick
-    rails (8.0.2.1)
-      actioncable (= 8.0.2.1)
-      actionmailbox (= 8.0.2.1)
-      actionmailer (= 8.0.2.1)
-      actionpack (= 8.0.2.1)
-      actiontext (= 8.0.2.1)
-      actionview (= 8.0.2.1)
-      activejob (= 8.0.2.1)
-      activemodel (= 8.0.2.1)
-      activerecord (= 8.0.2.1)
-      activestorage (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
-      bundler (>= 1.15.0)
-      railties (= 8.0.2.1)
-    rails-dom-testing (2.3.0)
-      activesupport (>= 5.0.0)
-      minitest
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
-      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (8.0.2.1)
-      actionpack (= 8.0.2.1)
-      activesupport (= 8.0.2.1)
-      irb (~> 1.13)
-      rackup (>= 1.0.0)
-      rake (>= 12.2)
-      thor (~> 1.0, >= 1.2.2)
-      zeitwerk (~> 2.6)
-    rake (13.3.0)
-    rdoc (6.14.2)
-      erb
-      psych (>= 4.0.0)
-    reline (0.6.2)
-      io-console (~> 0.5)
-    rspec (3.13.1)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.5)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.4)
-    securerandom (0.4.1)
-    thor (1.4.0)
-    timeout (0.4.3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-    uri (1.0.3)
-    useragent (0.16.11)
-    webrick (1.9.1)
-    websocket-driver (0.8.0-java)
-      base64
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.7.3)
-
-PLATFORMS
-  universal-java-21
-
-DEPENDENCIES
-  appraisal
-  rack (~> 2.2)
-  rails (~> 8.0.0)
-  rake (~> 13.3)
-  rspec
diff --git a/gemfiles/rails80_rack22.gemfile b/gemfiles/rails80_rack22.gemfile
new file mode 100644
index 000000000..470ec79a5
--- /dev/null
+++ b/gemfiles/rails80_rack22.gemfile
@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake", "~> 13.3", group: :test, require: nil
+gem "rspec", group: :test
+
+group :default do
+  gem "rack", "~> 2.2.0"
+  gem "rails", "~> 8.0.0"
+end
+
+group :development do
+  gem "appraisal", require: nil
+end
diff --git a/src/spec/ruby/jruby/rack/integration_spec.rb b/src/spec/ruby/jruby/rack/integration_spec.rb
index 482271f68..928cbcf85 100644
--- a/src/spec/ruby/jruby/rack/integration_spec.rb
+++ b/src/spec/ruby/jruby/rack/integration_spec.rb
@@ -136,8 +136,9 @@
 
     before(:all) do
       name = :rails72 # copy_gemfile :
-      FileUtils.cp File.join(GEMFILES_DIR, "#{name}.gemfile"), File.join(STUB_DIR, "#{name}/Gemfile")
-      FileUtils.cp File.join(GEMFILES_DIR, "#{name}.gemfile.lock"), File.join(STUB_DIR, "#{name}/Gemfile.lock")
+      raise "Environment variable BUNDLE_GEMFILE seems to not contain #{name.to_s}" unless ENV['BUNDLE_GEMFILE']&.include?(name.to_s)
+      FileUtils.cp ENV['BUNDLE_GEMFILE'], File.join(STUB_DIR, "#{name}/Gemfile")
+      FileUtils.cp "#{ENV['BUNDLE_GEMFILE']}.lock", File.join(STUB_DIR, "#{name}/Gemfile.lock")
       Dir.chdir File.join(STUB_DIR, name.to_s)
     end