diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index 19f4cab..b3c695f 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -6,6 +6,9 @@ jobs:
   build:
     name: Build FCE Ultra GX
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        image: ["Wii", "GameCube"]
     container: devkitpro/devkitppc:latest
  
     steps:
@@ -13,33 +16,46 @@ jobs:
       with:
         submodules: true
 
-    - name: Build
+    - name: Build Wii
+      if: ${{ matrix.image == 'Wii' }}
       run: |
-        make -j2
+        make -f Makefile.wii -j2     
     
-    - name: Copy files
+    - name: Copy Wii artifact
+      if: ${{ matrix.image == 'Wii' }}
       run: | 
         mkdir -p dist/FCEUltraGX/apps/fceugx
         mkdir -p dist/FCEUltraGX/fceugx/roms
         mkdir dist/FCEUltraGX/fceugx/cheats
-        mkdir dist/FCEUltraGX/fceugx/saves
-        mkdir dist/FCEUltraGX-GameCube/
+        mkdir dist/FCEUltraGX/fceugx/saves       
         touch dist/FCEUltraGX/fceugx/roms/romsdir
         touch dist/FCEUltraGX/fceugx/cheats/cheatsdir
         touch dist/FCEUltraGX/fceugx/saves/savesdir
         cp hbc/* dist/FCEUltraGX/apps/fceugx/
         cp executables/fceugx-wii.dol dist/FCEUltraGX/apps/fceugx/boot.dol
-        cp executables/fceugx-gc.dol dist/FCEUltraGX-GameCube/
 
-    - name: Upload Wii Build Artifacts
+    - name: Upload Wii artifacts
       uses: actions/upload-artifact@v2
+      if: ${{ matrix.image == 'Wii' }}
       with: 
         name: FCEUltraGX
         path: |
          dist/FCEUltraGX/
-    
-    - name: Upload GameCube Build Artifacts
+     
+    - name: Build GameCube
+      if: ${{ matrix.image == 'GameCube' }}
+      run: |
+        make -f Makefile.gc -j2
+        
+    - name: Copy GameCube artifact
+      if: ${{ matrix.image == 'GameCube' }}
+      run: | 
+        mkdir -p dist/FCEUltraGX-GameCube
+        cp executables/fceugx-gc.dol dist/FCEUltraGX-GameCube/
+        
+    - name: Upload GameCube artifact
       uses: actions/upload-artifact@v2
+      if: ${{ matrix.image == 'GameCube' }}
       with: 
         name: FCEUltraGX-GameCube
         path: |