diff --git a/.github/actions/clang-format/action.yml b/.github/actions/clang-format/action.yml
index a33e410f..1ddf3a15 100644
--- a/.github/actions/clang-format/action.yml
+++ b/.github/actions/clang-format/action.yml
@@ -3,15 +3,19 @@ inputs:
   directory:
     description: Directory to Lint
     required: true
+  version:
+    description: LLVM version to use # Should be kept roughly in sync with arcanist
+    required: false
+    default: 12
 
 runs:
   using: "composite"
   steps:
     - name: Install
       shell: bash
-      run: sudo apt install clang-format-12 # This should be roughly in sync with Arcanist
+      run: sudo apt install clang-format-${{ inputs.version }}
 
     - name: clang-format
       working-directory: ${{ inputs.directory }}
       shell: bash
-      run: clang-format-12 **/*.h **/*.cpp **/*.m **/*.mm
+      run: clang-format-${{ inputs.version }} --Werror **/*.h **/*.cpp # Yoga's config doesn't support ObjC
diff --git a/.github/workflows/valiadate-android.yml b/.github/workflows/valiadate-android.yml
index db721961..913f5090 100644
--- a/.github/workflows/valiadate-android.yml
+++ b/.github/workflows/valiadate-android.yml
@@ -18,7 +18,7 @@ jobs:
         run: ./gradlew assemble${{ matrix.mode }}
 
   format:
-    name: Build (${{ matrix.mode }})
+    name: Format
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/valiadate-apple.yml b/.github/workflows/valiadate-apple.yml
index ae5c01ae..d14486bc 100644
--- a/.github/workflows/valiadate-apple.yml
+++ b/.github/workflows/valiadate-apple.yml
@@ -27,15 +27,3 @@ jobs:
       - name: pod install
         working-directory: ./YogaKit/YogaKitSample
         run: pod install
-
-  clang-format:
-    name: Clang Format
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: clang-format
-        uses: ./.github/actions/clang-format
-        with:
-          directory: ./YogaKit
diff --git a/.github/workflows/valiadate-cpp.yml b/.github/workflows/valiadate-cpp.yml
index 6221fc08..3214ffad 100644
--- a/.github/workflows/valiadate-cpp.yml
+++ b/.github/workflows/valiadate-cpp.yml
@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   clang-format:
-    name: Clang Format
+    name: Format
     runs-on: ubuntu-latest
 
     steps: