diff --git a/.buildkite/android.yml b/.buildkite/android.yml
index 6ef9500d4..c8ff9f8e0 100644
--- a/.buildkite/android.yml
+++ b/.buildkite/android.yml
@@ -1,12 +1,13 @@
 steps:
-  - command:
+  - label: ":robot_face: Android Build"
+    command:
       - 'yarn cleaninstall --frozen-lockfile --skip-optional'
       - 'cd native/android'
       - './gradlew bundleRelease --no-daemon "-Dorg.gradle.jvmargs=-Xmx32g -XX:MaxPermSize=32g -XX:+HeapDumpOnOutOfMemoryError"'
     plugins:
       - docker#v3.13.0:
           image: 'reactnativecommunity/react-native-android:latest'
           environment:
             - 'BUILDKITE=true'
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/backup_build.yml b/.buildkite/backup_build.yml
index 69cd99c5c..84a24e99b 100644
--- a/.buildkite/backup_build.yml
+++ b/.buildkite/backup_build.yml
@@ -1,4 +1,5 @@
 steps:
-  - command: 'cd services && docker-compose build --no-cache backup-server'
+  - label: ":docker: Backup Build (Docker)"
+    command: 'cd services && docker-compose build --no-cache backup-server'
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/blob_build.yml b/.buildkite/blob_build.yml
index ae0ad79e6..b58719fd5 100644
--- a/.buildkite/blob_build.yml
+++ b/.buildkite/blob_build.yml
@@ -1,4 +1,5 @@
 steps:
-  - command: 'cd services && docker-compose build --no-cache blob-server'
+  - label: ":docker: Blob Build (Docker)"
+    command: 'cd services && docker-compose build --no-cache blob-server'
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/docker_keyserver.yml b/.buildkite/docker_keyserver.yml
index 3bf8cec68..0a7f66d9a 100644
--- a/.buildkite/docker_keyserver.yml
+++ b/.buildkite/docker_keyserver.yml
@@ -1,5 +1,5 @@
 steps:
-  - command:
-      - 'cd keyserver && touch .env && bash/dc.sh build --no-cache'
+  - label: ":docker: Keyserver Build (Docker)"
+    command: 'cd keyserver && touch .env && bash/dc.sh build --no-cache'
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/eslint_flow_jest.yml b/.buildkite/eslint_flow_jest.yml
index 0d3975352..3ab9cfbd4 100644
--- a/.buildkite/eslint_flow_jest.yml
+++ b/.buildkite/eslint_flow_jest.yml
@@ -1,13 +1,14 @@
 steps:
-  - command:
+  - label: ":eslint: :jest: ESLint & Flow & Jest"
+    command:
       - '(pkill flow || true)'
       - 'yarn cleaninstall --frozen-lockfile --skip-optional'
       - 'yarn eslint --max-warnings=0 & yarn workspace lib flow & yarn workspace web flow & yarn workspace landing flow & yarn workspace native flow & yarn workspace keyserver flow'
       - 'yarn workspace lib test && yarn workspace keyserver test'
     plugins:
       - docker#v3.13.0:
           image: 'node:16.13-bullseye'
           always-pull: true
           workdir: /comm
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/identity_build.yml b/.buildkite/identity_build.yml
index b61ad87d5..0e722a2d1 100644
--- a/.buildkite/identity_build.yml
+++ b/.buildkite/identity_build.yml
@@ -1,4 +1,5 @@
 steps:
-  - command: 'cd services && docker-compose build --no-cache identity-server'
+  - label: ":docker: Identity Build (Docker)"
+    command: 'cd services && docker-compose build --no-cache identity-server'
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/ios.yml b/.buildkite/ios.yml
index bc2df20b5..18209a915 100644
--- a/.buildkite/ios.yml
+++ b/.buildkite/ios.yml
@@ -1,7 +1,8 @@
 steps:
-  - command:
+  - label: ":ios: iOS Build"
+    command:
       - 'pod repo update && yarn workspace native clean-ios'
       - 'yarn cleaninstall --frozen-lockfile --skip-optional'
       - 'cd native/ios && xcodebuild -workspace Comm.xcworkspace -scheme Comm -destination generic/platform=iOS -allowProvisioningUpdates'
     agents:
       - 'mac=true'
diff --git a/.buildkite/tunnelbroker_build.yml b/.buildkite/tunnelbroker_build.yml
index 5b356e8f3..1e6403849 100644
--- a/.buildkite/tunnelbroker_build.yml
+++ b/.buildkite/tunnelbroker_build.yml
@@ -1,4 +1,5 @@
 steps:
-  - command: 'cd services && docker-compose build --no-cache tunnelbroker-server'
+  - label: ":docker: Tunnelbroker Build (Docker)"
+    command: 'cd services && docker-compose build --no-cache tunnelbroker-server'
     agents:
       - 'autoscaling=true'