diff --git a/.circleci/config.yml b/.circleci/config.yml
index c3bf80f687..d1c4d80a8b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -22,6 +22,13 @@ 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
@@ -31,3 +38,4 @@ workflows:
           filters:
             tags:
               only: /^v.*/
+      - format
diff --git a/OWNERS.md b/OWNERS.md
index ad90b72e46..28a3cf66b7 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -1,3 +1,5 @@
+# Envoy Mobile owners
+
 * See [CONTRIBUTING.md](CONTRIBUTING.md) for general contribution guidelines.
 
 This page lists all active maintainers and their areas of expertise. This can be used for
diff --git a/envoy b/envoy
index a87a09d1b4..0e109cb3ba 160000
--- a/envoy
+++ b/envoy
@@ -1 +1 @@
-Subproject commit a87a09d1b469942c206d07f4654983db26f1ecc2
+Subproject commit 0e109cb3ba3be0823bdb696eacb02a827989efa1
diff --git a/tools/check_format.sh b/tools/check_format.sh
new file mode 100755
index 0000000000..cc6b2276eb
--- /dev/null
+++ b/tools/check_format.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e
+
+export BUILDIFIER_BIN="/usr/local/bin/buildifier"
+
+envoy/tools/check_format.py --add-excluded-prefixes=./envoy/ check
+envoy/tools/format_python_tools.sh check