diff --git a/Gemfile b/Gemfile
index b3c4276162d..6c32d164ffe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,7 +79,7 @@ group :test do
   gem 'rspec-its'
   gem 'rspec-rails', '~> 8.0.2'
   gem 'rspec-wait'
-  gem 'rubocop', '~> 1.84.1'
+  gem 'rubocop', '~> 1.85.0'
   gem 'rubocop-capybara'
   gem 'rubocop-factory_bot'
   gem 'rubocop-rails', '~> 2.34'
diff --git a/Gemfile.lock b/Gemfile.lock
index 98d899cdf3a..71415b1f1aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -297,6 +297,8 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     machinist (1.0.6)
+    mcp (0.7.1)
+      json-schema (>= 4.1)
     membrane (1.1.0)
     method_source (1.1.0)
     mime-types (3.7.0)
@@ -353,7 +355,7 @@ GEM
     parallel (1.27.0)
     parallel_tests (5.6.0)
       parallel
-    parser (3.3.10.1)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
     pg (1.6.3)
@@ -475,10 +477,11 @@ GEM
       activesupport (>= 3.0.0)
       mustache (~> 1.0, >= 0.99.4)
       rspec (~> 3.0)
-    rubocop (1.84.1)
+    rubocop (1.85.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
+      mcp (~> 0.6)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
@@ -679,7 +682,7 @@ DEPENDENCIES
   rspec-rails (~> 8.0.2)
   rspec-wait
   rspec_api_documentation (>= 6.1.0)
-  rubocop (~> 1.84.1)
+  rubocop (~> 1.85.0)
   rubocop-capybara
   rubocop-factory_bot
   rubocop-rails (~> 2.34)