diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml
index fd3b2312da..7879b4b819 100644
--- a/.github/workflows/cross.yml
+++ b/.github/workflows/cross.yml
@@ -38,13 +38,13 @@ jobs:
 
       - name: Add toolchain target
         run: rustup target add ${{ matrix.target }}
-        if: contains(matrix.target, 'gnullvm') == false || contains(matrix.target, 'gnullvm') && startsWith(matrix.image, 'ubuntu-')
+        if: contains(matrix.target, 'gnullvm') == false || startsWith(matrix.image, 'ubuntu-') && contains(matrix.target, 'gnullvm') && matrix.version == 'nightly'
 
       - name: Add nightly toolchain with rust-src
         run: |
           rustup default ${{ matrix.version }}
           rustup component add rust-src
-        if: startsWith(matrix.image, 'ubuntu-') && startsWith(matrix.image, 'ubuntu-') && contains(matrix.target, 'gnullvm') && matrix.version == 'nightly'
+        if: startsWith(matrix.image, 'ubuntu-') && contains(matrix.target, 'gnullvm') && matrix.version == 'nightly'
 
       - name: Install gcc-mingw-w64-x86-64
         run: sudo apt-get install -y gcc-mingw-w64-x86-64