diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3d3d3c89f..1aab99e40 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -39,6 +39,11 @@ 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: |
@@ -56,6 +61,10 @@ 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: |
@@ -78,10 +87,6 @@ jobs:
         lime config ANDROID_SETUP true
         lime config
 
-    - name: Rebuild Lime tools
-      run: |
-        lime rebuild tools -nocolor -verbose
-
     - name: Rebuild Lime (HashLink)
       run: |
         lime rebuild hl -release -verbose -nocolor