diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 14b60d1cc..d121f0d28 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -5,6 +5,10 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: macos-latest
+    
+    env:
+      RELEASE_NAME: raylib-3.1_macos
+    
     steps:
     - name: Checkout
       uses: actions/checkout@master
@@ -13,28 +17,29 @@ jobs:
       run: | 
         mkdir build
         cd build
-        mkdir raylib_3.1_macos
-        cd raylib_3.1_macos
+        mkdir ${{ env.RELEASE_NAME }}
+        cd ${{ env.RELEASE_NAME }}
         mkdir include
         mkdir lib
-        cd ../../raylib
+        cd ../..
    
     - name: Build Library
       run: |
         cd src
-        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../../build/raylib_3.1_macos/lib
-        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../../build/raylib_3.1_macos/lib
+        gcc -v
+        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make clean
+        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
   
     - name: Generate Artifacts
       run: |
-        cd ..
-        copy /Y src/raylib.h ../../build/raylib_3.1_macos/include
-        cd ../build
-        zip raylib_3.1_macos.zip raylib_3.1_macos
+        cp -v ./src/raylib.h ./build/${{ env.RELEASE_NAME }}/include
+        cd build
+        tar -czvf ./${{ env.RELEASE_NAME }}.tar.gz ./${{ env.RELEASE_NAME }}
         
     - name: Upload Artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: raylib_3.1_macos.zip
-        path: raylib_3.1_macos.zip
+        name: ${{ env.RELEASE_NAME }}.tar.gz
+        path: ./build/${{ env.RELEASE_NAME }}.tar.gz