diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e24ae98a9..414fe324d4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,9 +39,7 @@ executors:
 
   macos:
     parameters:
-      xcode-version:
-        type: string
-        default: *default-xcode-version
+      xcode-version: { type: string, default: *default-xcode-version }
     macos:
       xcode: << parameters.xcode-version >>
     environment:
@@ -190,18 +188,15 @@ commands:
       - restore_cache:
           name: Restore Homebrew cache
           key: v0-homebrew-{{ arch }}
-      - when:
-          condition: { equal: [ << pipeline.git.branch >>, master ] }
-          steps:
-            - run:
-                name: Update Homebrew
-                command: |
-                  brew --version
-                  brew update --preinstall
       - run:
-          name: Install Homebrew dependencies
+          name: Update Homebrew
           command: |
             brew --version
+            brew update --preinstall
+            brew --version
+      - run:
+          name: Install Homebrew dependencies
+          command: |
             brew bundle --no-upgrade
 
   save-homebrew-cache:
@@ -253,10 +248,7 @@ commands:
 
   prepare-for-build:
     parameters:
-      os:
-        type: enum
-        enum: ["linux", "macos", "windows"]
-        default: linux
+      os: { type: enum, enum: [ "linux", "macos", "windows" ], default: linux }
     steps:
       - checkout
       - when:
@@ -498,9 +490,7 @@ jobs:
   # Build using macOS
   build-macos:
     parameters:
-      xcode-version:
-        type: string
-        default: *default-xcode-version
+      xcode-version: { type: string, default: *default-xcode-version }
     executor:
       name: macos
       xcode-version: << parameters.xcode-version >>
@@ -510,8 +500,7 @@ jobs:
       RUSTFLAGS: -D warnings -C target-cpu=penryn
       CONSENSUS_ENCLAVE_CSS: /Users/distiller/project/sgx/css/src/valid.css
     steps:
-      - prepare-for-build:
-          os: macos
+      - prepare-for-build: { os: macos }
       - run:
           name: Cargo check
           command: |