diff --git a/Appraisals b/Appraisals
index 6e4a1bf..0e36913 100644
--- a/Appraisals
+++ b/Appraisals
@@ -9,3 +9,7 @@ end
 appraise "activerecord-7.0" do
   gem "activerecord", "~> 7.0.0"
 end
+
+appraise "activerecord-7.1" do
+  gem "activerecord", "~> 7.1.0"
+end
diff --git a/Gemfile b/Gemfile
index b94b717..b464979 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,10 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in stator.gemspec
 gemspec
 
-# Locking to specific git sha to work around
-# https://github.com/thoughtbot/appraisal/issues/211
-# until appraisal v3 is released
-gem "appraisal", github: "thoughtbot/appraisal", ref: "b200e636903"
+gem "appraisal"
 
 gem "activerecord-nulldb-adapter"
 gem "rake"
diff --git a/gemfiles/activerecord_6.0.gemfile b/gemfiles/activerecord_6.0.gemfile
index f1b4b39..9dbf2e4 100644
--- a/gemfiles/activerecord_6.0.gemfile
+++ b/gemfiles/activerecord_6.0.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", github: "thoughtbot/appraisal", ref: "b200e636903"
+gem "appraisal"
 gem "activerecord-nulldb-adapter"
 gem "rake"
 gem "rspec"
diff --git a/gemfiles/activerecord_6.0.gemfile.lock b/gemfiles/activerecord_6.0.gemfile.lock
index 2f8d471..9ed28c8 100644
--- a/gemfiles/activerecord_6.0.gemfile.lock
+++ b/gemfiles/activerecord_6.0.gemfile.lock
@@ -1,17 +1,7 @@
-GIT
-  remote: https://github.com/thoughtbot/appraisal.git
-  revision: b200e636903700098bef25f4f51dbc4c46e4c04c
-  ref: b200e636903
-  specs:
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-
 PATH
   remote: ..
   specs:
-    stator (0.5.0)
+    stator (0.6.0)
       activerecord (>= 5.1)
 
 GEM
@@ -30,7 +20,11 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    concurrent-ruby (1.3.3)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    concurrent-ruby (1.3.4)
     diff-lcs (1.5.1)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
@@ -61,7 +55,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 6.0.0)
   activerecord-nulldb-adapter
-  appraisal!
+  appraisal
   rake
   rspec
   stator!
diff --git a/gemfiles/activerecord_6.1.gemfile b/gemfiles/activerecord_6.1.gemfile
index 0f175b7..5895e7c 100644
--- a/gemfiles/activerecord_6.1.gemfile
+++ b/gemfiles/activerecord_6.1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", github: "thoughtbot/appraisal", ref: "b200e636903"
+gem "appraisal"
 gem "activerecord-nulldb-adapter"
 gem "rake"
 gem "rspec"
diff --git a/gemfiles/activerecord_6.1.gemfile.lock b/gemfiles/activerecord_6.1.gemfile.lock
index 8013636..3eda7d4 100644
--- a/gemfiles/activerecord_6.1.gemfile.lock
+++ b/gemfiles/activerecord_6.1.gemfile.lock
@@ -1,17 +1,7 @@
-GIT
-  remote: https://github.com/thoughtbot/appraisal.git
-  revision: b200e636903700098bef25f4f51dbc4c46e4c04c
-  ref: b200e636903
-  specs:
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-
 PATH
   remote: ..
   specs:
-    stator (0.5.0)
+    stator (0.6.0)
       activerecord (>= 5.1)
 
 GEM
@@ -30,7 +20,11 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    concurrent-ruby (1.3.3)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    concurrent-ruby (1.3.4)
     diff-lcs (1.5.1)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
@@ -60,7 +54,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 6.1.0)
   activerecord-nulldb-adapter
-  appraisal!
+  appraisal
   rake
   rspec
   stator!
diff --git a/gemfiles/activerecord_7.0.gemfile b/gemfiles/activerecord_7.0.gemfile
index f1d8395..a7daf75 100644
--- a/gemfiles/activerecord_7.0.gemfile
+++ b/gemfiles/activerecord_7.0.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", github: "thoughtbot/appraisal", ref: "b200e636903"
+gem "appraisal"
 gem "activerecord-nulldb-adapter"
 gem "rake"
 gem "rspec"
diff --git a/gemfiles/activerecord_7.0.gemfile.lock b/gemfiles/activerecord_7.0.gemfile.lock
index e77213b..6fe6bd8 100644
--- a/gemfiles/activerecord_7.0.gemfile.lock
+++ b/gemfiles/activerecord_7.0.gemfile.lock
@@ -1,17 +1,7 @@
-GIT
-  remote: https://github.com/thoughtbot/appraisal.git
-  revision: b200e636903700098bef25f4f51dbc4c46e4c04c
-  ref: b200e636903
-  specs:
-    appraisal (2.4.1)
-      bundler
-      rake
-      thor (>= 0.14.0)
-
 PATH
   remote: ..
   specs:
-    stator (0.5.0)
+    stator (0.6.0)
       activerecord (>= 5.1)
 
 GEM
@@ -29,7 +19,11 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    concurrent-ruby (1.3.3)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    concurrent-ruby (1.3.4)
     diff-lcs (1.5.1)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
@@ -58,7 +52,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 7.0.0)
   activerecord-nulldb-adapter
-  appraisal!
+  appraisal
   rake
   rspec
   stator!
diff --git a/gemfiles/activerecord_7.1.gemfile b/gemfiles/activerecord_7.1.gemfile
new file mode 100644
index 0000000..4655a63
--- /dev/null
+++ b/gemfiles/activerecord_7.1.gemfile
@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "activerecord-nulldb-adapter"
+gem "rake"
+gem "rspec"
+gem "activerecord", "~> 7.1.0"
+
+gemspec path: "../"
diff --git a/gemfiles/activerecord_7.1.gemfile.lock b/gemfiles/activerecord_7.1.gemfile.lock
new file mode 100644
index 0000000..29cd447
--- /dev/null
+++ b/gemfiles/activerecord_7.1.gemfile.lock
@@ -0,0 +1,74 @@
+PATH
+  remote: ..
+  specs:
+    stator (0.6.0)
+      activerecord (>= 5.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
+      timeout (>= 0.4.0)
+    activerecord-nulldb-adapter (1.0.1)
+      activerecord (>= 5.2.0, < 7.2)
+    activesupport (7.1.3.4)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      mutex_m
+      tzinfo (~> 2.0)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    i18n (1.14.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.24.1)
+    mutex_m (0.2.0)
+    rake (13.2.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    thor (1.3.1)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  arm64-darwin-23
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 7.1.0)
+  activerecord-nulldb-adapter
+  appraisal
+  rake
+  rspec
+  stator!
+
+BUNDLED WITH
+   2.5.17