diff --git a/Gemfile b/Gemfile
index 3f05359394f2..35a4543de498 100644
--- a/Gemfile
+++ b/Gemfile
@@ -255,7 +255,7 @@ group :test do
   gem 'webmock', '~> 3.12', require: false
 
   # Mock selenium requests through proxy (for feature tests)
-  gem 'puffing-billy', '~> 3.2.0'
+  gem 'puffing-billy', '~> 4.0.0'
   gem 'table_print', '~> 1.5.6'
 
   gem 'equivalent-xml', '~> 0.6'
@@ -316,7 +316,7 @@ end
 gem 'bootsnap', '~> 1.16.0', require: false
 
 # API gems
-gem 'grape', '~> 1.7.0'
+gem 'grape', '~> 1.8.0'
 gem 'grape_logging', '~> 1.8.4'
 gem 'roar', '~> 1.2.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 81839635bb2c..6b081a637f17 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
     awesome_nested_set (3.5.0)
       activerecord (>= 4.0.0, < 7.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.812.0)
+    aws-partitions (1.814.0)
     aws-sdk-core (3.181.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
@@ -370,7 +370,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    css_parser (1.14.0)
+    css_parser (1.15.0)
       addressable
     cuprite (0.14.3)
       capybara (~> 3.0)
@@ -511,12 +511,12 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grape (1.7.1)
-      activesupport
+    grape (1.8.0)
+      activesupport (>= 5)
       builder
       dry-types (>= 1.1)
       mustermann-grape (~> 1.0.0)
-      rack (>= 1.3.0, < 3)
+      rack (>= 1.3.0)
       rack-accept
     grape_logging (1.8.4)
       grape
@@ -544,7 +544,8 @@ GEM
     ice_cube (0.16.4)
     interception (0.5)
     io-console (0.6.0)
-    irb (1.7.4)
+    irb (1.8.0)
+      rdoc (~> 6.5)
       reline (>= 0.3.6)
     iso8601 (0.13.0)
     jmespath (1.6.2)
@@ -714,7 +715,7 @@ GEM
     psych (5.1.0)
       stringio
     public_suffix (5.0.3)
-    puffing-billy (3.2.0)
+    puffing-billy (4.0.0)
       addressable (~> 2.5)
       em-http-request (~> 1.1, >= 1.1.0)
       em-synchrony
@@ -1045,7 +1046,7 @@ DEPENDENCIES
   gon (~> 6.4.0)
   google-apis-gmail_v1
   googleauth
-  grape (~> 1.7.0)
+  grape (~> 1.8.0)
   grape_logging (~> 1.8.4)
   grids!
   html-pipeline (~> 2.14.0)
@@ -1110,7 +1111,7 @@ DEPENDENCIES
   pry-byebug (~> 3.10.0)
   pry-rails (~> 0.3.6)
   pry-rescue (~> 1.5.2)
-  puffing-billy (~> 3.2.0)
+  puffing-billy (~> 4.0.0)
   puma (~> 6.3)
   puma-plugin-statsd (~> 2.0)
   rack-attack (~> 6.7.0)