diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a91c9a206..ee87ac5d9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,57 +34,56 @@ jobs:
 
     - name: Install Haxe dependencies
       run: |
-        haxelib git hxcpp https://github.com/haxefoundation/hxcpp --quiet
+        git clone https://github.com/haxefoundation/hxcpp
+        haxelib dev hxcpp hxcpp
+        cd hxcpp/tools/hxcpp
+        haxe compile.hxml
+
         haxelib install format  --quiet
         haxelib install hxp  --quiet
         haxelib git lime-samples https://github.com/openfl/lime-samples --quiet
 
-    - name: Windows | Enable HXCPP compile cache
+    - name: [Windows] Enable HXCPP compile cache
       if: ${{ startsWith(matrix.os, 'windows-') }}
       run: |
         echo "HXCPP_COMPILE_CACHE=C:\.hxcpp" >> $GITHUB_ENV
 
-    - name: Linux/macOS | Enable HXCPP compile cache
+    - name: [Linux/macOS] Enable HXCPP compile cache
       if: ${{ !startsWith(matrix.os, 'windows-') }}
       run: |
         echo "HXCPP_COMPILE_CACHE=~/.hxcpp" >> $GITHUB_ENV
 
-    - name: Linux | Install Android NDK
+    - name: [Linux] Install Android NDK
       if: ${{ startsWith(matrix.os, 'ubuntu-') }}
       uses: nttld/setup-ndk@v1
       id: setup-ndk
       with:
         ndk-version: r15c
 
-    - name: Windows | Rebuild Lime tools
+    - name: [Windows] Rebuild Lime tools
       if: ${{ startsWith(matrix.os, 'windows-') }}
       run: |
         haxelib dev lime $Env:GITHUB_WORKSPACE
         haxelib run lime rebuild tools -nocolor -verbose -nocffi
 
-    - name: Linux/macOS | Rebuild Lime tools
+    - name: [Linux/macOS] Rebuild Lime tools
       if: ${{ !startsWith(matrix.os, 'windows-') }}
       run: |
         haxelib dev lime $GITHUB_WORKSPACE
         haxelib run lime rebuild tools -nocolor -verbose -nocffi
 
-    - name: Rebuild dev HXCPP
-      if: ${{ !startsWith(matrix.os, 'windows-') }}
-      run: |
-        haxelib run lime rebuild hxcpp
-
-    - name: Windows | Install "lime" command alias
+    - name: [Windows] Install "lime" command alias
       if: ${{ startsWith(matrix.os, 'windows-') }}
       run: |
         haxelib run lime setup -alias -y -nocffi
 
-    - name: Linux/macOS | Install "lime" command alias
+    - name: [Linux/macOS] Install "lime" command alias
       if: ${{ !startsWith(matrix.os, 'windows-') }}
       run: |
         haxelib run lime setup -alias -y -nocffi
         lime || alias lime="haxelib run lime"
 
-    - name: Linux | Configure Android support
+    - name: [Linux] Configure Android support
       if: ${{ startsWith(matrix.os, 'ubuntu-') }}
       run: |
         lime config ANDROID_SDK $ANDROID_HOME