diff --git a/mobile/.circleci/config.yml b/mobile/.circleci/config.yml
index d1c4d80a8b2f..c3bf80f68742 100644
--- a/mobile/.circleci/config.yml
+++ b/mobile/.circleci/config.yml
@@ -22,13 +22,6 @@ jobs:
       - run: docs/publish.sh
       - store_artifacts:
           path: generated/docs
-  format:
-    executor: ubuntu-build
-    # TODO(mattklein123): resource_class: small
-    steps:
-      - checkout
-      - run: git submodule update --init
-      - run: tools/check_format.sh
 
 workflows:
   version: 2
@@ -38,4 +31,3 @@ workflows:
           filters:
             tags:
               only: /^v.*/
-      - format
diff --git a/mobile/azure-pipelines.yml b/mobile/azure-pipelines.yml
index 96034e07a0bf..3002b4b291b6 100644
--- a/mobile/azure-pipelines.yml
+++ b/mobile/azure-pipelines.yml
@@ -1,5 +1,7 @@
 resources:
   containers:
+  - container: envoy-container
+    image: envoyproxy/envoy-build:cfc514546bc0284536893cca5fa43d7128edcd35
   - container: swiftlint-container
     image: norionomura/swiftlint:0.33.0_swift-5.0
 
@@ -7,67 +9,77 @@ trigger:
 - master
 
 jobs:
-  - job: ios_swift_lint
-    timeoutInMinutes: 360
+  - job: all_format
+    timeoutInMinutes: 60
     pool:
       vmImage: 'Ubuntu 16.04'
-    container: swiftlint-container
+    container: envoy-container
     steps:
       - checkout: self
         submodules: true
-      - script: swiftlint lint --strict
-        displayName: 'Run SwiftLint'
-  - job: iOS_dist
-    timeoutInMinutes: 360
-    pool:
-      vmImage: 'macos-10.14'
-    steps:
-      - checkout: self
-        submodules: true
-      - script: ./envoy/ci/mac_ci_setup.sh
-        displayName: 'Install dependencies'
-      - script: bazel build --config=ios //:ios_dist
-        displayName: 'Build Envoy.framework distributable'
-      - task: PublishPipelineArtifact@0
-        displayName: 'Publish Envoy.framework distributable'
-        inputs:
-          artifactName: 'Envoy.framework'
-          targetPath: 'dist/Envoy.framework'
-  - job: iOS_objc
-    dependsOn: iOS_dist
-    timeoutInMinutes: 360
-    pool:
-      vmImage: 'macos-10.14'
-    steps:
-      - checkout: self
-        submodules: true
-      - script: ./envoy/ci/mac_ci_setup.sh
-        displayName: 'Install dependencies'
-      - script: mkdir -p dist/Envoy.framework
-        displayName: 'Create directory for distributable'
-      - task: DownloadPipelineArtifact@0
-        displayName: 'Download Envoy.framework distributable'
-        inputs:
-          artifactName: Envoy.framework
-          targetPath: ./dist/Envoy.framework
-      - script: bazel build --config=ios //examples/objective-c/hello_world:app
-        displayName: 'Build objective-c app'
-  - job: iOS_swift
-    dependsOn: iOS_dist
-    timeoutInMinutes: 360
+      - script: ./tools/check_format.sh
+        displayName: 'Run formatters'
+  - job: ios_swift_lint
+    timeoutInMinutes: 60
     pool:
-      vmImage: 'macos-10.14'
+      vmImage: 'Ubuntu 16.04'
+    container: swiftlint-container
     steps:
       - checkout: self
         submodules: true
-      - script: ./envoy/ci/mac_ci_setup.sh
-        displayName: 'Install dependencies'
-      - script: mkdir -p dist/Envoy.framework
-        displayName: 'Create directory for distributable'
-      - task: DownloadPipelineArtifact@0
-        displayName: 'Download Envoy.framework distributable'
-        inputs:
-          artifactName: Envoy.framework
-          targetPath: ./dist/Envoy.framework
-      - script: bazel build --config=ios //examples/swift/hello_world:app
-        displayName: 'Build swift app'
+      - script: swiftlint lint --strict
+        displayName: 'Run SwiftLint'
+  # - job: iOS_dist
+  #   timeoutInMinutes: 360
+  #   pool:
+  #     vmImage: 'macos-10.14'
+  #   steps:
+  #     - checkout: self
+  #       submodules: true
+  #     - script: ./envoy/ci/mac_ci_setup.sh
+  #       displayName: 'Install dependencies'
+  #     - script: bazel build --config=ios //:ios_dist
+  #       displayName: 'Build Envoy.framework distributable'
+  #     - task: PublishPipelineArtifact@0
+  #       displayName: 'Publish Envoy.framework distributable'
+  #       inputs:
+  #         artifactName: 'Envoy.framework'
+  #         targetPath: 'dist/Envoy.framework'
+  # - job: iOS_objc
+  #   dependsOn: iOS_dist
+  #   timeoutInMinutes: 360
+  #   pool:
+  #     vmImage: 'macos-10.14'
+  #   steps:
+  #     - checkout: self
+  #       submodules: true
+  #     - script: ./envoy/ci/mac_ci_setup.sh
+  #       displayName: 'Install dependencies'
+  #     - script: mkdir -p dist/Envoy.framework
+  #       displayName: 'Create directory for distributable'
+  #     - task: DownloadPipelineArtifact@0
+  #       displayName: 'Download Envoy.framework distributable'
+  #       inputs:
+  #         artifactName: Envoy.framework
+  #         targetPath: ./dist/Envoy.framework
+  #     - script: bazel build --config=ios //examples/objective-c/hello_world:app
+  #       displayName: 'Build objective-c app'
+  # - job: iOS_swift
+  #   dependsOn: iOS_dist
+  #   timeoutInMinutes: 360
+  #   pool:
+  #     vmImage: 'macos-10.14'
+  #   steps:
+  #     - checkout: self
+  #       submodules: true
+  #     - script: ./envoy/ci/mac_ci_setup.sh
+  #       displayName: 'Install dependencies'
+  #     - script: mkdir -p dist/Envoy.framework
+  #       displayName: 'Create directory for distributable'
+  #     - task: DownloadPipelineArtifact@0
+  #       displayName: 'Download Envoy.framework distributable'
+  #       inputs:
+  #         artifactName: Envoy.framework
+  #         targetPath: ./dist/Envoy.framework
+  #     - script: bazel build --config=ios //examples/swift/hello_world:app
+  #       displayName: 'Build swift app'