diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1aab99e40..d9e9f7eb9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,11 +39,6 @@ jobs:
         haxelib install hxp  --quiet
         haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
 
-    - name: Rebuild dev HXCPP
-      if: ${{ !startsWith(matrix.os, 'windows-') }}
-      run: |
-        haxelib run lime rebuild hxcpp
-
     - name: Enable HXCPP compile cache (Linux/macOS)
       if: ${{ !startsWith(matrix.os, 'windows-') }}
       run: |
@@ -61,22 +56,25 @@ jobs:
       with:
         ndk-version: r15c
 
-    - name: Rebuild Lime tools
-      run: |
-        haxelib run lime rebuild tools -nocolor -verbose
-
     - name: Install "lime" command alias (Linux/macOS)
       if: ${{ !startsWith(matrix.os, 'windows-') }}
       run: |
         haxelib dev lime $GITHUB_WORKSPACE
-        haxelib run lime setup -alias -y
+        haxelib run lime rebuild tools -nocolor -verbose
+        haxelib run lime setup -alias -y -nocffi
         lime || alias lime="haxelib run lime"
 
     - name: Install "lime" command alias (Windows)
       if: ${{ startsWith(matrix.os, 'windows-') }}
       run: |
         haxelib dev lime $Env:GITHUB_WORKSPACE
-        haxelib run lime setup -alias -y
+        haxelib run lime rebuild tools -nocolor -verbose
+        haxelib run lime setup -alias -y -nocffi
+
+    - name: Rebuild dev HXCPP
+      if: ${{ !startsWith(matrix.os, 'windows-') }}
+      run: |
+        haxelib run lime rebuild hxcpp
 
     - name: Configure Android support (Linux)
       if: ${{ startsWith(matrix.os, 'ubuntu-') }}