diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ec23d8f7..06770905 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -57,8 +57,16 @@ jobs:
           docker push cs50/codespace:${{ github.sha }}
           docker push cs50/codespace:latest
 
+      - name: Build (canary)
+        if: ${{ github.ref == 'refs/heads/canary' }}
+        run: |
+          export TAG=canary
+          export VCS_REF=$(git rev-parse HEAD)
+          npm install -g @devcontainers/cli
+          devcontainer build --workspace-folder . --config devcontainer.json --image-name cs50/codespace:${{ github.sha }} --image-name cs50/codespace:${{ github.ref_name }}
+
       - name: Build ${{ github.ref_name}}
-        if: ${{ github.ref != 'refs/heads/main' }}
+        if: ${{ github.ref != 'refs/heads/main' || github.ref != 'refs/heads/canary' }}
         run: |
           export TAG=amd64
           export VCS_REF=$(git rev-parse HEAD)