diff --git a/.github/workflows/test_solidus.yml b/.github/workflows/test_solidus.yml
index a6fd7b7b80..a24afaa4b1 100644
--- a/.github/workflows/test_solidus.yml
+++ b/.github/workflows/test_solidus.yml
@@ -37,6 +37,10 @@ jobs:
             ruby: "3.4"
             database: sqlite
             storage: activestorage
+          - rails: "8.0"
+            ruby: "4.0"
+            database: postgres
+            storage: activestorage
     env:
       BUNDLE_WITHOUT: "lint release"
       COVERAGE_DIR: ${{ github.workspace }}/${{ inputs.lib_name }}/coverage
diff --git a/bin/rails-application-template b/bin/rails-application-template
index c7af695c08..4a4b7ac4b8 100755
--- a/bin/rails-application-template
+++ b/bin/rails-application-template
@@ -18,7 +18,7 @@ if $0 == __FILE__
 end
 
 gem 'solidus'
-gem 'solidus_auth_devise'
+gem 'solidus_auth_devise', github: 'solidusio/solidus_auth_devise', branch: 'main'
 gem 'rails_12factor'
 
 gem_group :heroku do