diff --git a/.buildkite/android.yml b/.buildkite/android.yml
--- a/.buildkite/android.yml
+++ b/.buildkite/android.yml
@@ -9,6 +9,8 @@
       - 'yarn cleaninstall --frozen-lockfile --skip-optional'
       - 'cd native/android'
       - './gradlew clean && ./gradlew bundleRelease --no-daemon "-Dorg.gradle.jvmargs=-Xmx32g -XX:MaxPermSize=32g -XX:+HeapDumpOnOutOfMemoryError"'
+    retry:
+      automatic: true
     plugins:
       - docker#v3.13.0:
           image: 'reactnativecommunity/react-native-android:latest'
diff --git a/.buildkite/backup_build.yml b/.buildkite/backup_build.yml
--- a/.buildkite/backup_build.yml
+++ b/.buildkite/backup_build.yml
@@ -1,5 +1,7 @@
 steps:
-  - label: ":docker: Backup Build (Docker)"
+  - label: ':docker: Backup Build (Docker)'
     command: 'cd services && docker-compose build --no-cache backup-server'
+    retry:
+      automatic: true
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/blob_build.yml b/.buildkite/blob_build.yml
--- a/.buildkite/blob_build.yml
+++ b/.buildkite/blob_build.yml
@@ -1,5 +1,7 @@
 steps:
-  - label: ":docker: Blob Build (Docker)"
+  - label: ':docker: Blob Build (Docker)'
     command: 'cd services && docker-compose build --no-cache blob-server'
+    retry:
+      automatic: true
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/blob_unittests.yml b/.buildkite/blob_unittests.yml
--- a/.buildkite/blob_unittests.yml
+++ b/.buildkite/blob_unittests.yml
@@ -1,7 +1,9 @@
 steps:
-  - label: ":nix: Blob Unittests"
+  - label: ':nix: Blob Unittests'
     command:
       - 'cd services/blob'
       - 'nix develop --accept-flake-config --command cargo test'
+    retry:
+      automatic: true
     agents:
       - 'mac=true'
diff --git a/.buildkite/cmakecheck.yml b/.buildkite/cmakecheck.yml
--- a/.buildkite/cmakecheck.yml
+++ b/.buildkite/cmakecheck.yml
@@ -4,6 +4,8 @@
       - 'pip install cmakelang'
       - 'shopt -s globstar'
       - 'cmake-lint **/CMakeLists.txt **/*.cmake'
+    retry:
+      automatic: true
     plugins:
       - docker#v3.13.0:
           image: 'python:bullseye'
diff --git a/.buildkite/docker_keyserver.yml b/.buildkite/docker_keyserver.yml
--- a/.buildkite/docker_keyserver.yml
+++ b/.buildkite/docker_keyserver.yml
@@ -1,5 +1,7 @@
 steps:
-  - label: ":docker: Keyserver Build (Docker)"
+  - label: ':docker: Keyserver Build (Docker)'
     command: 'cd keyserver && touch .env && bash/dc.sh build --no-cache'
+    retry:
+      automatic: true
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/eslint_flow_jest.yml b/.buildkite/eslint_flow_jest.yml
--- a/.buildkite/eslint_flow_jest.yml
+++ b/.buildkite/eslint_flow_jest.yml
@@ -7,6 +7,8 @@
       - 'yarn cleaninstall --frozen-lockfile --skip-optional --network-timeout 180000'
       - '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 desktop flow'
       - 'yarn workspace lib test && yarn workspace keyserver test'
+    retry:
+      automatic: true
     plugins:
       - docker#v3.13.0:
           image: 'node:16.13-bullseye'
diff --git a/.buildkite/identity_build.yml b/.buildkite/identity_build.yml
--- a/.buildkite/identity_build.yml
+++ b/.buildkite/identity_build.yml
@@ -1,5 +1,7 @@
 steps:
-  - label: ":docker: Identity Build (Docker)"
+  - label: ':docker: Identity Build (Docker)'
     command: 'cd services && docker-compose build --no-cache identity-server'
+    retry:
+      automatic: true
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/identity_tests.yml b/.buildkite/identity_tests.yml
--- a/.buildkite/identity_tests.yml
+++ b/.buildkite/identity_tests.yml
@@ -1,9 +1,11 @@
 env:
-  PATH: "$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
+  PATH: '$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH'
 steps:
-  - label: ":nix: Identity Tests (Nix)"
+  - label: ':nix: Identity Tests (Nix)'
     command:
       - 'cd services/identity'
       - 'nix develop --accept-flake-config --command cargo test'
+    retry:
+      automatic: true
     agents:
       - 'mac=true'
diff --git a/.buildkite/ios.yml b/.buildkite/ios.yml
--- a/.buildkite/ios.yml
+++ b/.buildkite/ios.yml
@@ -6,7 +6,9 @@
       - 'source /Users/comm/.cargo/env'
       - 'yarn cleaninstall --frozen-lockfile --skip-optional'
       - 'cd native/ios && xcodebuild -workspace Comm.xcworkspace -scheme Comm -destination generic/platform=iOS -allowProvisioningUpdates'
+    retry:
+      automatic: true
     env:
-      PROTOC: "/opt/homebrew/bin/protoc"
+      PROTOC: '/opt/homebrew/bin/protoc'
     agents:
       - 'mac=true'
diff --git a/.buildkite/jsi_codegen.yml b/.buildkite/jsi_codegen.yml
--- a/.buildkite/jsi_codegen.yml
+++ b/.buildkite/jsi_codegen.yml
@@ -4,6 +4,8 @@
       - '(pkill flow || true)'
       - 'yarn cleaninstall --frozen-lockfile --skip-optional --network-timeout 180000'
       - 'cd native && yarn codegen-jsi && git diff --exit-code'
+    retry:
+      automatic: true
     plugins:
       - docker#v3.13.0:
           image: 'node:16.13-bullseye'
diff --git a/.buildkite/nix_yarn.yml b/.buildkite/nix_yarn.yml
--- a/.buildkite/nix_yarn.yml
+++ b/.buildkite/nix_yarn.yml
@@ -1,5 +1,7 @@
 steps:
   - label: 'nix develop -c yarn cleaninstall --network-timeout 180000'
     command: 'nix develop --accept-flake-config -c yarn cleaninstall --network-timeout 180000'
+    retry:
+      automatic: true
     agents:
       - 'nixdarwin=true'
diff --git a/.buildkite/shellcheck.yml b/.buildkite/shellcheck.yml
--- a/.buildkite/shellcheck.yml
+++ b/.buildkite/shellcheck.yml
@@ -4,6 +4,8 @@
       - 'apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y shellcheck'
       - 'shopt -s globstar'
       - 'shellcheck -x -P SCRIPTDIR **/*.sh'
+    retry:
+      automatic: true
     plugins:
       - docker#v3.13.0:
           image: 'debian:stable'
diff --git a/.buildkite/tunnelbroker_build.yml b/.buildkite/tunnelbroker_build.yml
--- a/.buildkite/tunnelbroker_build.yml
+++ b/.buildkite/tunnelbroker_build.yml
@@ -1,5 +1,7 @@
 steps:
-  - label: ":docker: Tunnelbroker Build (Docker)"
+  - label: ':docker: Tunnelbroker Build (Docker)'
     command: 'cd services && docker-compose build --no-cache tunnelbroker-server'
+    retry:
+      automatic: true
     agents:
       - 'autoscaling=true'
diff --git a/.buildkite/tunnelbroker_unittests.yml b/.buildkite/tunnelbroker_unittests.yml
--- a/.buildkite/tunnelbroker_unittests.yml
+++ b/.buildkite/tunnelbroker_unittests.yml
@@ -1,5 +1,5 @@
 env:
-  PATH: "$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
+  PATH: '$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH'
 steps:
   - label: ':nix: Tunnelbroker Unittests'
     command:
@@ -10,5 +10,7 @@
       - 'rm -rf build'
       - 'nix develop --accept-flake-config -c bash -c "cmake -B build . && make -C build -j"'
       - 'build/runTests --gtest_filter="-AmqpManager*:DatabaseManager*"'
+    retry:
+      automatic: true
     agents:
       - 'mac=true'