diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f208f3f..9e2ea30 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,71 +7,24 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
-        rails-version: ['~> 6.1', '~> 7.0', '~> 7.1', '~> 7.2', '~> 8.0']
+        ruby-version: ['3.1', '3.2', '3.3', '3.4']
+        rails-version: ['~> 7.2', '~> 8.0', '~> 8.1']
         argon2-version: ['2.2', '2.3']
+        devise-version: ['~> 4.9', 'main']
         orm:
           - adapter: active_record
           - adapter: mongoid
-            mongoid-version: 9.0.2
+            mongoid-version: 9.0.3
           - adapter: mongoid
-            mongoid-version: 8.1.6
-          - adapter: mongoid
-            mongoid-version: 8.0.8
-          - adapter: mongoid
-            mongoid-version: 7.5.4
+            mongoid-version: 8.1.7
         exclude:
-          - rails-version: '~> 7.2'
-            ruby-version: '2.7'
-          - rails-version: '~> 7.2'
-            ruby-version: '3.0'
-          - rails-version: '~> 8.0'
-            ruby-version: '2.7'
-          - rails-version: '~> 8.0'
-            ruby-version: '3.0'
+          - rails-version: '~> 8.1'
+            ruby-version: '3.1'
           - rails-version: '~> 8.0'
             ruby-version: '3.1'
-          - rails-version: '~> 6.1'
-            ruby-version: '3.4'
-          - orm:
-              adapter: mongoid
-            rails-version: '~> 8.0'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 8.0.8
-            ruby-version: '3.3'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 8.0.8
-            ruby-version: '3.4'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 8.0.8
-            ruby-version: '3.2'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 7.5.4
-            ruby-version: '3.3'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 7.5.4
-            ruby-version: '3.4'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 7.5.4
-            ruby-version: '3.2'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 8.0.8
-            rails-version: '~> 7.2'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 7.5.4
-            rails-version: '~> 7.2'
           - orm:
               adapter: mongoid
-              mongoid-version: 7.5.4
-            rails-version: '~> 7.1'
+            rails-version: '~> 8.1'
     env:
       RAILS_VERSION: ${{ matrix.rails-version  || '~> 8.0'}}
       MONGOID_VERSION: ${{ matrix.orm.mongoid-version || '8.1.6'}}
diff --git a/Gemfile b/Gemfile
index fa18c3d..79f808f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,19 +7,15 @@ gem 'simplecov'
 gem 'activerecord'
 gem 'rails', ENV['RAILS_VERSION'] || '~> 8.0'
 gem 'argon2', ENV['ARGON2_VERSION'] || '~> 2.3'
-gem 'devise', ENV['DEVISE_VERSION'] || '~> 4.9'
 
-if ENV['ORM'] == 'mongoid'
-  gem 'mongoid', ENV['MONGOID_VERSION'] || '~> 7.5'
-end
-
-if ENV['RAILS_VERSION'] == '~> 8.0'
-  gem 'sqlite3', '~> 2.1'
+if ENV['DEVISE_VERSION'] == 'main'
+  gem 'devise', github: 'heartcombo/devise'
 else
-  gem 'sqlite3', '~> 1.6', '>= 1.6.6'
+  gem 'devise', ENV['DEVISE_VERSION'] || '~> 4.9'
 end
 
-if ['~> 6.1', '~> 7.0'].include? ENV['RAILS_VERSION']
-  gem 'concurrent-ruby', '1.3.4'
+if ENV['ORM'] == 'mongoid'
+  gem 'mongoid', ENV['MONGOID_VERSION'] || '~> 7.5'
 end
 
+gem 'sqlite3', '~> 2.8'
diff --git a/devise-argon2.gemspec b/devise-argon2.gemspec
index 3f57b17..0266f7c 100644
--- a/devise-argon2.gemspec
+++ b/devise-argon2.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'devise', '~> 4.0'
+  gem.add_dependency 'devise', '>= 4.0'
   gem.add_dependency 'argon2', '~> 2.1'