diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ebbc7cae0f..90ccc09dd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,8 +14,8 @@ jobs:
       BUF_VERSION: '0.41.0'
     strategy:
       matrix:
-        node: [14]
-        os: [ubuntu-latest]
+        node: [14, 16]
+        os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
diff --git a/bors.toml b/bors.toml
index 73e2fc807f..813eae142f 100644
--- a/bors.toml
+++ b/bors.toml
@@ -1,5 +1,8 @@
 status = [
   "build_and_test (14, ubuntu-latest)",
+  "build_and_test (16, ubuntu-latest)",
+  "build_and_test (14, macos-latest)",
+  "build_and_test (16, macos-latest)",
   "web_chat_build_and_test"
 ]
 block_labels = ["work-in-progress"]