diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a91bea9b2d..f7b63a195c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -146,6 +146,15 @@ jobs:
         if: "!matrix.use_sysroot && !startsWith(matrix.os, 'windows')"
         run: echo "RUSTFLAGS=-D warnings" >> $GITHUB_ENV
 
+      - name: Configure canary build
+        if: |
+          matrix.kind == 'test' &&
+          matrix.profile == 'release' &&
+          github.repository == 'denoland/deno' &&
+          github.ref == 'refs/heads/main'
+        shell: bash
+        run: echo "DENO_CANARY=true" >> $GITHUB_ENV
+
       - name: Set up Linux sysroot with Ubuntu 18.04 and LLVM
         if: matrix.use_sysroot
         run: |
@@ -212,7 +221,7 @@ jobs:
             # Miscellaneous flags.
             export CARGO_TERM_COLOR=always
             export CI=true
-            export DENO_CANARY=true
+            export DENO_CANARY=$DENO_CANARY
           ___
 
       - name: Log versions
@@ -297,16 +306,6 @@ jobs:
                       ~/.cargo/registry/index/github.com-1ecc6299db9ec823
           fi
 
-      - name: Configure canary build
-        if: |
-          matrix.kind == 'test' &&
-          matrix.profile == 'release' &&
-          !matrix.use_sysroot &&
-          github.repository == 'denoland/deno' &&
-          github.ref == 'refs/heads/main'
-        shell: bash
-        run: echo "DENO_CANARY=true" >> $GITHUB_ENV
-
       - name: test_format.js
         if: matrix.kind == 'lint'
         run: deno run --unstable --allow-write --allow-read --allow-run ./tools/format.js --check