diff --git a/.github/workflows/rspec.yml b/.github/workflows/rspec.yml
index a49e018..ba15137 100644
--- a/.github/workflows/rspec.yml
+++ b/.github/workflows/rspec.yml
@@ -12,65 +12,76 @@ jobs:
     env:
       BUNDLE_JOBS: 4
       BUNDLE_RETRY: 3
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}
       CI: true
       RAILS_ENV: test
       DATABASE_URL: postgres://postgres:postgres@localhost:5432
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.1"]
-        postgres: ["12"]
+        ruby: ["3.4"]
+        postgres: ["16"]
         gemfile: [
-          "gemfiles/rails72.gemfile"
+          rails8.gemfile
         ]
         fx: ["false"]
         after_trigger: ["false"]
         include:
-        - ruby: "3.2"
+        - ruby: "3.4"
+          postgres: "16"
+          gemfile: rails8.gemfile
+          fx: "false"
+          after_trigger: "false"
+        - ruby: "3.3"
+          postgres: "16"
+          gemfile: rails8.gemfile
+          fx: "false"
+          after_trigger: "true"
+        - ruby: "3.3"
+          postgres: "16"
+          gemfile: rails72.gemfile
+          fx: "false"
+          after_trigger: "false"
+        - ruby: "3.3"
           postgres: "15"
-          gemfile: "gemfiles/railsmaster.gemfile"
+          gemfile: railsmaster.gemfile
           fx: "false"
           after_trigger: "false"
         - ruby: "3.2"
           postgres: "15"
-          gemfile: "gemfiles/rails72.gemfile"
+          gemfile: rails72.gemfile
           fx: "false"
           after_trigger: "false"
         - ruby: "3.2"
           postgres: "15"
-          gemfile: "gemfiles/rails71.gemfile"
+          gemfile: rails71.gemfile
           fx: "false"
           after_trigger: "false"
         - ruby: "3.2"
           postgres: "15"
-          gemfile: "gemfiles/rails70.gemfile"
+          gemfile: rails70.gemfile
           fx: "false"
           after_trigger: "false"
         - ruby: "3.1"
           postgres: "12"
-          gemfile: "gemfiles/rails72.gemfile"
+          gemfile: rails72.gemfile
           fx: "false"
           after_trigger: "true"
-        - ruby: "3.0"
-          postgres: "13"
-          gemfile: "gemfiles/rails72.gemfile"
-          fx: "false"
-          after_trigger: "false"
         - ruby: "2.7"
           postgres: "13"
-          gemfile: "gemfiles/rails6.gemfile"
+          gemfile: rails6.gemfile
           fx: "false"
           after_trigger: "false"
           table_name_prefix: 'prefix-'
           table_name_suffix: '-suffix'
         - ruby: "2.7"
           postgres: "11"
-          gemfile: "gemfiles/rails6.gemfile"
+          gemfile: rails6.gemfile
           fx: "false"
           after_trigger: "true"
         - ruby: "2.7"
           postgres: "10"
-          gemfile: "gemfiles/rails6.gemfile"
+          gemfile: rails6.gemfile
           fx: "false"
           after_trigger: "false"
     services:
@@ -85,11 +96,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     steps:
-    - uses: actions/checkout@v3
-    - name: Install system deps
-      run: |
-        sudo apt-get update
-        sudo apt-get -yqq install libpq-dev
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
diff --git a/gemfiles/rails8.gemfile b/gemfiles/rails8.gemfile
new file mode 100644
index 0000000..917463d
--- /dev/null
+++ b/gemfiles/rails8.gemfile
@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+rails_version = '~> 8.0.0'
+gem 'railties', rails_version
+gem 'activerecord', rails_version
+
+eval_gemfile './shared.gemfile'
+
+gemspec path: '..'
diff --git a/logidze.gemspec b/logidze.gemspec
index ce5e86f..e99f2d0 100644
--- a/logidze.gemspec
+++ b/logidze.gemspec
@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", ">= 13.0"
   spec.add_development_dependency "rspec-rails", ">= 4.0"
   spec.add_development_dependency "timecop", "~> 0.8"
+  spec.add_development_dependency "concurrent-ruby", "1.3.4" # Remove once https://github.com/rails/rails/issues/54263 is resolved
 end