diff --git a/.buildkite/cache-builder.yml b/.buildkite/cache-builder.yml
index 19955d75c65..6eca8b20fc5 100644
--- a/.buildkite/cache-builder.yml
+++ b/.buildkite/cache-builder.yml
@@ -10,7 +10,10 @@ common_params:
     - automattic/bash-cache#2.8.0
     - automattic/git-s3-cache#v1.1.3:
         bucket: "a8c-repo-mirrors"
-        repo: "woocommerce/woocommerce-ios/"
+        # This is not necessarily the actual name of the repo or the GitHub organization
+        # it belongs to. It is the key used in the bucket, which is set based on
+        # the Buildkite pipeline slug
+        repo: "automattic/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
     IMAGE_ID: xcode-14
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index f95268e420d..680dd870bd7 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -5,7 +5,10 @@ common_params:
     - automattic/bash-cache#2.8.0
     - automattic/git-s3-cache#v1.1.3:
         bucket: "a8c-repo-mirrors"
-        repo: "woocommerce/woocommerce-ios/"
+        # This is not necessarily the actual name of the repo or the GitHub organization
+        # it belongs to. It is the key used in the bucket, which is set based on
+        # the Buildkite pipeline slug
+        repo: "automattic/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
     IMAGE_ID: xcode-14
diff --git a/.buildkite/release-builds.yml b/.buildkite/release-builds.yml
index 7882d016846..63846500a9b 100644
--- a/.buildkite/release-builds.yml
+++ b/.buildkite/release-builds.yml
@@ -7,7 +7,10 @@ common_params:
     - automattic/bash-cache#2.8.0
     - automattic/git-s3-cache#v1.1.3:
         bucket: "a8c-repo-mirrors"
-        repo: "woocommerce/woocommerce-ios/"
+        # This is not necessarily the actual name of the repo or the GitHub organization
+        # it belongs to. It is the key used in the bucket, which is set based on
+        # the Buildkite pipeline slug
+        repo: "automattic/woocommerce-ios/"
   # Common environment values to use with the `env` key.
   - &common_env
     IMAGE_ID: xcode-14