diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 9a52626ab..23cadc67e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -1,9 +1,9 @@
 # Nodes with values to reuse in the pipeline.
 common_params:
   plugins: &common_plugins
-  - &bash_cache automattic/bash-cache#v1.5.0: ~
+  - &bash_cache automattic/bash-cache#2.0.0: ~
   env: &common_env
-    IMAGE_ID: xcode-12.5.1
+    IMAGE_ID: xcode-13
 
 # This is the default pipeline – it will build and test the pod
 steps:
@@ -12,7 +12,10 @@ 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
 
@@ -21,7 +24,10 @@ 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
 
@@ -30,7 +36,10 @@ 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 35b4cc2f4..77eb5eeb1 100644
--- 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/.ruby-version b/.ruby-version
index 2714f5313..a4dd9dba4 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.6.4
+2.7.4