diff --git a/Gemfile b/Gemfile
index 783e69cda55..1ea3cfa5e07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,10 +8,7 @@ source 'https://rubygems.org'
 # favorite editor. See https://github.com/firebase/firebase-ios-sdk/pull/8498
 # for examples.
 
-# gem 'cocoapods', git: "https://github.com/CocoaPods/CocoaPods.git", ref: "9cebcde577f56aa26f27d8aa501b51fdd4d6abdb"
-# gem 'cocoapods-core', git: "https://github.com/CocoaPods/Core.git", ref: "f7cf05720eab935d7d50e35224d263952176fb53"
-# gem 'xcodeproj', git: "https://github.com/CocoaPods/Xcodeproj.git", ref: "eeccae7275645753cbaf45d96fc4b23e4b8b3b9f"
+gem 'cocoapods', git: "https://github.com/CocoaPods/CocoaPods.git", ref: "204b415"
 
-gem 'cocoapods', '1.16.0'
 gem 'cocoapods-generate', '2.2.5'
 gem 'danger', '8.4.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5504ae41b46..126cc89f575 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,27 @@
+GIT
+  remote: https://github.com/CocoaPods/CocoaPods.git
+  revision: 204b4158866900594790eb6d725cf80a642c0dbd
+  ref: 204b415
+  specs:
+    cocoapods (1.16.0)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.16.0)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.26.0, < 2.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -28,24 +52,6 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.16.0)
-      addressable (~> 2.8)
-      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.16.0)
-      cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 2.1, < 3.0)
-      cocoapods-plugins (>= 1.0.0, < 2.0)
-      cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.6.0, < 2.0)
-      cocoapods-try (>= 1.1.0, < 2.0)
-      colored2 (~> 3.1)
-      escape (~> 0.0.4)
-      fourflusher (>= 2.3.0, < 3.0)
-      gh_inspector (~> 1.0)
-      molinillo (~> 0.8.0)
-      nap (~> 1.0)
-      ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.26.0, < 2.0)
     cocoapods-core (1.16.0)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
@@ -172,7 +178,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.16.0)
+  cocoapods!
   cocoapods-generate (= 2.2.5)
   danger (= 8.4.5)