diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 173862cf..2ffe5308 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,10 +1,10 @@
 # Nodes with values to reuse in the pipeline.
 common_params:
   plugins: &common_plugins
-  - &bash_cache automattic/bash-cache#v1.3.2: ~
+  - &bash_cache automattic/bash-cache#2.0.0: ~
   # Common environment values to use with the `env` key.
   env: &common_env
-    IMAGE_ID: xcode-12.5.1
+    IMAGE_ID: xcode-13
 
 # This is the default pipeline – it will build and test the app
 steps:
@@ -13,7 +13,11 @@ steps:
   #################
   - label: "🧪 Build and Test"
     key: "test"
-    command: "build_and_test_pod"
+    command: |
+      # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+      gem install bundler:2.3.4
+
+      build_and_test_pod
     env: *common_env
     plugins: *common_plugins
 
@@ -22,7 +26,11 @@ steps:
   #################
   - label: "🔬 Validate Podspec"
     key: "validate"
-    command: "validate_podspec"
+    command: |
+      # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+      gem install bundler:2.3.4
+
+      validate_podspec
     env: *common_env
     plugins: *common_plugins
 
@@ -31,7 +39,11 @@ steps:
   #################
   - label: "🧹 Lint"
     key: "lint"
-    command: "lint_pod"
+    command: |
+      # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+      gem install bundler:2.3.4
+
+      lint_pod
     env: *common_env
     plugins: *common_plugins
 
diff --git a/.buildkite/publish-pod.sh b/.buildkite/publish-pod.sh
index 8bc6425d..2ef6b26e 100755
--- a/.buildkite/publish-pod.sh
+++ b/.buildkite/publish-pod.sh
@@ -5,6 +5,9 @@ SPECS_REPO="git@github.com:wordpress-mobile/cocoapods-specs.git"
 SLACK_WEBHOOK=$PODS_SLACK_WEBHOOK
 
 echo "--- :rubygems: Setting up Gems"
+# See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16
+gem install bundler:2.3.4
+
 install_gems
 
 echo "--- :cocoapods: Publishing Pod to CocoaPods CDN"
diff --git a/.gitignore b/.gitignore
index 54170b13..9fefe48a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,6 +85,7 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots/**/*.png
 fastlane/test_output
+fastlane/README.md
 
 # rubygems
 vendor/
diff --git a/.ruby-version b/.ruby-version
index 2714f531..a4dd9dba 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.4
+2.7.4