diff --git a/Gemfile b/Gemfile
index 8e9261196..c5ac64538 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 git_source(:bc) { |repo| "https://github.com/basecamp/#{repo}" }
 
-gem "rails", github: "flavorjones/rails", branch: "flavorjones/fix-script-name-in-root-mounted-engine"
+gem "rails", github: "rails/rails", branch: "main"
 
 # Assets & front end
 gem "importmap-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index d5ea57eee..4d38c63d0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,9 +89,17 @@ GIT
       zeitwerk (~> 2)
 
 GIT
-  remote: https://github.com/flavorjones/rails.git
-  revision: ba3d32ece6a1a1289b8981a987656dbf3d0e700c
-  branch: flavorjones/fix-script-name-in-root-mounted-engine
+  remote: https://github.com/jeremy/mysql2.git
+  revision: b5766f5d296745d6aed014c8c0b7d82ef149ade1
+  ref: b5766f5d296745d6aed014c8c0b7d82ef149ade1
+  branch: force_latin1_to_utf8
+  specs:
+    mysql2 (0.5.4.latin1utf8)
+
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: d8795bd762ab2716b6e7fd07a403566b28159cdc
+  branch: main
   specs:
     actioncable (8.1.0.beta1)
       actionpack (= 8.1.0.beta1)
@@ -189,14 +197,6 @@ GIT
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
 
-GIT
-  remote: https://github.com/jeremy/mysql2.git
-  revision: b5766f5d296745d6aed014c8c0b7d82ef149ade1
-  ref: b5766f5d296745d6aed014c8c0b7d82ef149ade1
-  branch: force_latin1_to_utf8
-  specs:
-    mysql2 (0.5.4.latin1utf8)
-
 PATH
   remote: gems/fizzy-saas
   specs: