diff --git a/.github/workflows/buildifier.yaml b/.github/workflows/buildifier.yaml
index 1f00a3a8..85d16c8b 100644
--- a/.github/workflows/buildifier.yaml
+++ b/.github/workflows/buildifier.yaml
@@ -10,14 +10,14 @@ on:
 
 jobs:
   buildifier:
-    runs-on: 'ubuntu-latest'
+    runs-on: ${{ vars.USE_SELF_HOSTED == 'true' && 'self-hosted' || 'ubuntu-latest' }}
     strategy:
       fail-fast: false
       matrix:
         check:
-          - name: Run buildifier format
+          - name: Buildifier format
             run: ./buildifier -r -mode=check -lint=off .
-          - name: Run buildifier lint
+          - name: Buildifier lint
             run: ./buildifier -r -lint=warn .
     name: ${{ matrix.check.name }}
     env: