diff --git a/Gemfile b/Gemfile
index cfa3fa994..b5f1a94ec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -115,7 +115,7 @@ gem "pagy", "< 7"
 
 # We use a constant here so that we can ensure that all of the bullet_train-*
 # packages are on the same version.
-BULLET_TRAIN_VERSION = "1.7.20"
+BULLET_TRAIN_VERSION = "1.7.21"
 
 # Core packages.
 gem "bullet_train", BULLET_TRAIN_VERSION
diff --git a/Gemfile.lock b/Gemfile.lock
index b874a390a..cf6edf6cf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -126,7 +126,7 @@ GEM
     bootsnap (1.18.4)
       msgpack (~> 1.2)
     builder (3.3.0)
-    bullet_train (1.7.20)
+    bullet_train (1.7.21)
       awesome_print
       bullet_train-has_uuid
       bullet_train-roles
@@ -149,7 +149,7 @@ GEM
       microscope
       nice_partials (~> 0.9)
       omniauth
-      pagy
+      pagy (< 7)
       possessive
       premailer-rails
       rails (>= 6.0.0)
@@ -159,72 +159,72 @@ GEM
       unicode-emoji
       valid_email
       xxhash
-    bullet_train-api (1.7.20)
+    bullet_train-api (1.7.21)
       bullet_train
       bullet_train-super_scaffolding
       colorizer
       doorkeeper
       factory_bot
       jbuilder-schema (~> 2.6.6)
-      pagy
+      pagy (< 7)
       pagy_cursor
       rack-cors
       rails (>= 6.0.0)
-    bullet_train-fields (1.7.20)
+    bullet_train-fields (1.7.21)
       chronic
       cloudinary
       phonelib
       rails (>= 6.0.0)
-    bullet_train-has_uuid (1.7.20)
+    bullet_train-has_uuid (1.7.21)
       rails (>= 6.0.0)
-    bullet_train-incoming_webhooks (1.7.20)
+    bullet_train-incoming_webhooks (1.7.21)
       bullet_train
       bullet_train-api
       bullet_train-super_scaffolding
       rails (>= 6.0.0)
-    bullet_train-integrations (1.7.20)
+    bullet_train-integrations (1.7.21)
       rails (>= 6.0.0)
-    bullet_train-integrations-stripe (1.7.20)
+    bullet_train-integrations-stripe (1.7.21)
       omniauth
       omniauth-rails_csrf_protection
       omniauth-stripe-connect
       rails (>= 6.0.0)
       stripe
-    bullet_train-obfuscates_id (1.7.20)
+    bullet_train-obfuscates_id (1.7.21)
       hashids
       rails (>= 6.0.0)
-    bullet_train-outgoing_webhooks (1.7.20)
+    bullet_train-outgoing_webhooks (1.7.21)
       public_suffix
       rails (>= 6.0.0)
-    bullet_train-roles (1.7.20)
+    bullet_train-roles (1.7.21)
       active_hash
       activesupport
       cancancan
     bullet_train-routes (1.0.0)
       rails (>= 6.0.0)
-    bullet_train-scope_questions (1.7.20)
+    bullet_train-scope_questions (1.7.21)
       rails (>= 6.0.0)
-    bullet_train-scope_validator (1.7.20)
+    bullet_train-scope_validator (1.7.21)
       rails
-    bullet_train-sortable (1.7.20)
+    bullet_train-sortable (1.7.21)
       rails (>= 6.0.0)
-    bullet_train-super_load_and_authorize_resource (1.7.20)
+    bullet_train-super_load_and_authorize_resource (1.7.21)
       cancancan
       rails (>= 6.0.0)
-    bullet_train-super_scaffolding (1.7.20)
+    bullet_train-super_scaffolding (1.7.21)
       colorizer
       indefinite_article
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes (1.7.20)
+    bullet_train-themes (1.7.21)
       bullet_train-fields
       nice_partials (~> 0.9)
       rails (>= 6.0.0)
-    bullet_train-themes-light (1.7.20)
+    bullet_train-themes-light (1.7.21)
       bullet_train-themes-tailwind_css
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes-tailwind_css (1.7.20)
+    bullet_train-themes-tailwind_css (1.7.21)
       bullet_train-themes
       rails (>= 6.0.0)
     cable_ready (5.0.5)
@@ -719,24 +719,24 @@ DEPENDENCIES
   avo (>= 3.1.7)
   aws-sdk-s3
   bootsnap
-  bullet_train (= 1.7.20)
-  bullet_train-api (= 1.7.20)
-  bullet_train-fields (= 1.7.20)
-  bullet_train-has_uuid (= 1.7.20)
-  bullet_train-incoming_webhooks (= 1.7.20)
-  bullet_train-integrations (= 1.7.20)
-  bullet_train-integrations-stripe (= 1.7.20)
-  bullet_train-obfuscates_id (= 1.7.20)
-  bullet_train-outgoing_webhooks (= 1.7.20)
-  bullet_train-roles (= 1.7.20)
-  bullet_train-scope_questions (= 1.7.20)
-  bullet_train-scope_validator (= 1.7.20)
-  bullet_train-sortable (= 1.7.20)
-  bullet_train-super_load_and_authorize_resource (= 1.7.20)
-  bullet_train-super_scaffolding (= 1.7.20)
-  bullet_train-themes (= 1.7.20)
-  bullet_train-themes-light (= 1.7.20)
-  bullet_train-themes-tailwind_css (= 1.7.20)
+  bullet_train (= 1.7.21)
+  bullet_train-api (= 1.7.21)
+  bullet_train-fields (= 1.7.21)
+  bullet_train-has_uuid (= 1.7.21)
+  bullet_train-incoming_webhooks (= 1.7.21)
+  bullet_train-integrations (= 1.7.21)
+  bullet_train-integrations-stripe (= 1.7.21)
+  bullet_train-obfuscates_id (= 1.7.21)
+  bullet_train-outgoing_webhooks (= 1.7.21)
+  bullet_train-roles (= 1.7.21)
+  bullet_train-scope_questions (= 1.7.21)
+  bullet_train-scope_validator (= 1.7.21)
+  bullet_train-sortable (= 1.7.21)
+  bullet_train-super_load_and_authorize_resource (= 1.7.21)
+  bullet_train-super_scaffolding (= 1.7.21)
+  bullet_train-themes (= 1.7.21)
+  bullet_train-themes-light (= 1.7.21)
+  bullet_train-themes-tailwind_css (= 1.7.21)
   capybara (~> 3.39)
   capybara-email
   capybara-lockstep
diff --git a/package.json b/package.json
index 623457cb0..7c9500b3e 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,9 @@
   "name": "app",
   "private": true,
   "dependencies": {
-    "@bullet-train/bullet-train": "1.7.20",
-    "@bullet-train/bullet-train-sortable": "1.7.20",
-    "@bullet-train/fields": "1.7.20",
+    "@bullet-train/bullet-train": "1.7.21",
+    "@bullet-train/bullet-train-sortable": "1.7.21",
+    "@bullet-train/fields": "1.7.21",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@fullhuman/postcss-purgecss": "6.0.0",
     "@hotwired/turbo-rails": "^8.0.5",
diff --git a/yarn.lock b/yarn.lock
index 85715ab7a..1172e4887 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1495,30 +1495,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@bullet-train/bullet-train-sortable@npm:1.7.20":
-  version: 1.7.20
-  resolution: "@bullet-train/bullet-train-sortable@npm:1.7.20"
+"@bullet-train/bullet-train-sortable@npm:1.7.21":
+  version: 1.7.21
+  resolution: "@bullet-train/bullet-train-sortable@npm:1.7.21"
   dependencies:
     "@hotwired/stimulus": "npm:^3.0.1"
     "@rails/request.js": "npm:^0.0.6"
     dragula: "npm:^3.7.3"
     jquery: "npm:^3.7.1"
-  checksum: 10c0/67e307e52e43e9cc44992085972f6378b82dfb5b64cb02eac196a05161879257321bb17d4ddf689b2668710b0aff45261c84682f04bebbc83776c3b07bfa1e98
+  checksum: 10c0/3e0f7025f46ebd76acab790c085ac0afbc85855bee881bc22f9c0fb33b9eb4c2c313e3fbabd5af08312d5f490f929d67c79c196e6badf9f09aa84f00bba0b759
   languageName: node
   linkType: hard
 
-"@bullet-train/bullet-train@npm:1.7.20":
-  version: 1.7.20
-  resolution: "@bullet-train/bullet-train@npm:1.7.20"
+"@bullet-train/bullet-train@npm:1.7.21":
+  version: 1.7.21
+  resolution: "@bullet-train/bullet-train@npm:1.7.21"
   dependencies:
     "@hotwired/stimulus": "npm:^3.0.1"
-  checksum: 10c0/49e724c8b326cc24c3ec49603ac561d58b6817328dbad0c8584d21e4097d7b1c2e306651ad4a45de307c149a7274fc59dede8f329e283b22acc443de84427b69
+  checksum: 10c0/6c18810480629a3b1465448eb58ca976b3345aba4ce5774069158ed83f1a3d791b9adbdfb4681fc0815d5e34183615847eccd818d9ab632ced9a729a0572cffe
   languageName: node
   linkType: hard
 
-"@bullet-train/fields@npm:1.7.20":
-  version: 1.7.20
-  resolution: "@bullet-train/fields@npm:1.7.20"
+"@bullet-train/fields@npm:1.7.21":
+  version: 1.7.21
+  resolution: "@bullet-train/fields@npm:1.7.21"
   dependencies:
     "@hotwired/stimulus": "npm:^3.0.1"
     "@simonwep/pickr": "npm:^1.8.1"
@@ -1531,7 +1531,7 @@ __metadata:
     tributejs: "npm:^5.1.3"
     trix: "npm:^2.0.1"
     zxcvbn: "npm:^4.4.2"
-  checksum: 10c0/8c0e1eaae9afb0070b83a70d41fc22ebbfb7f4dc62ddceb700f03a0af1d959d391ab9e25a9e5f17702290cc6f0b46313a942b1fa36fcbcfd4127771e2838dcaa
+  checksum: 10c0/522112d41052a125594fc41467ea9fa3fd14a3ce029d9fad9ac31966dc316a5a2b34f46c6802d58cb55337942562c5f3ee9e82787a318e9f9be3d4d3a5dbbce9
   languageName: node
   linkType: hard
 
@@ -2198,9 +2198,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "app@workspace:."
   dependencies:
-    "@bullet-train/bullet-train": "npm:1.7.20"
-    "@bullet-train/bullet-train-sortable": "npm:1.7.20"
-    "@bullet-train/fields": "npm:1.7.20"
+    "@bullet-train/bullet-train": "npm:1.7.21"
+    "@bullet-train/bullet-train-sortable": "npm:1.7.21"
+    "@bullet-train/fields": "npm:1.7.21"
     "@esbuild-plugins/node-globals-polyfill": "npm:^0.2.3"
     "@fullhuman/postcss-purgecss": "npm:6.0.0"
     "@hotwired/turbo-rails": "npm:^8.0.5"