diff --git a/.circleci/config.yml b/.circleci/config.yml
index 550e9cb..51f787e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,8 +48,7 @@ jobs:
                 name: Import CI context
                 command: |
                   set -e
-                  fastlane match_dev
-                  fastlane match_dist
+                  fastlane circleci
       - restore_cache:
           # Caching Homebrew's files (see the save_cache step below) means that Homebrew doesn't have to update as
           # much. The Homebrew update can take several minutes without this, but with the cache it tends to take less
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 7bb2c42..b9bb030 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -16,10 +16,6 @@
 default_platform(:mac)
 
 platform :mac do
-  before_all do
-    setup_circle_ci
-  end
-
   desc "Use Fastlane Match to install development certificates"
   lane :match_dev do
     match(type: "development", platform: "macos", output_path: "build", readonly: is_ci)
@@ -30,4 +26,11 @@ platform :mac do
     match(type: "appstore", platform: "macos", output_path: "build", readonly: is_ci, additional_cert_types: "mac_installer_distribution")
     match(type: "developer_id", platform: "macos", output_path: "build", readonly: is_ci, additional_cert_types: "developer_id_installer")
   end
+
+  desc "Prepare for a CircleCI signed build"
+  lane :circleci do
+    setup_circle_ci
+    match_dev
+    match_dist
+  end
 end
diff --git a/fastlane/README.md b/fastlane/README.md
index 4ed97f4..960c06c 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -31,6 +31,14 @@ Use Fastlane Match to install development certificates
 
 Use Fastlane Match to install distribution certificates
 
+### mac circleci
+
+```sh
+[bundle exec] fastlane mac circleci
+```
+
+Prepare for a CircleCI signed build
+
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.