diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 3269e1a3b..26d3943cb 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -45,15 +45,24 @@ jobs:
         sudo apt-get install -y --no-install-recommends libglfw3 libglfw3-dev libx11-dev libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev libxext-dev libxfixes-dev
       
     # TODO: Review i386 shared library building or remove it
-    - name: Build Library
+    - name: Build Library i386
+      run: |
+        cd src
+        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 PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
+        cd ..
+      if: matrix.bits == 32
+ 
+    - name: Build Library amd64
       run: |
-        ls //usr/lib
         cd src
         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 ..
+      if: matrix.bits == 64
     
     - name: Generate Artifacts
       run: |
diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml
index 56746052c..7db3142b9 100644
--- a/.github/workflows/webassembly.yml
+++ b/.github/workflows/webassembly.yml
@@ -22,9 +22,6 @@ jobs:
       with:
         version: 2.0.0
         actions-cache-folder: 'emsdk-cache'
-        
-    - name: Test emsdk
-      run: emcc -v
 
     - name: Setup Environment
       run: | 
@@ -39,6 +36,7 @@ jobs:
     - name: Build Library
       run: |
         cd src
+        emcc -v
         make PLATFORM=PLATFORM_WEB EMSDK_PATH="D:/a/raylib/raylib/emsdk-cache/emsdk-master" RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
         cd ..
   
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 932aac87a..e28368d10 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -18,10 +18,14 @@ jobs:
         include:
         - compiler: mingw-w64
           bits: 32
-          ARCH: "x86"  
+          ARCH: "x86"
+          COMPILER_PATH: "C:\\msys64\\mingw32\\bin"
+          COMPILER_NAME: "i686-w64-mingw32-gcc.exe" 
         - compiler: mingw-w64
           bits: 64
           ARCH: "x64"
+          COMPILER_PATH: "C:\\msys64\\mingw64\\bin"
+          COMPILER_NAME: "x86_64-w64-mingw32-gcc.exe"  
         - compiler: msvc16
           bits: 32
           ARCH: "x86"
@@ -54,16 +58,18 @@ jobs:
       uses: microsoft/setup-msbuild@v1.0.1
       if: matrix.compiler == 'msvc16'
    
-    # TODO: Review x86 dynamic library building or remove it
+    # TODO: Compile resource file raylib.dll.rc for linkage on raylib.dll generation
     - name: Build Library (MinGW-w64)
       run: |
         cd src
-        gcc -v
-        make PLATFORM=PLATFORM_DESKTOP CC=gcc RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        set PATH=%PATH%;${{ matrix.COMPILER_PATH }}
+        ${{ matrix.COMPILER_NAME }} -v
+        make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.COMPILER_NAME }} RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=STATIC RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib"
+        make PLATFORM=PLATFORM_DESKTOP CC=${{ matrix.COMPILER_NAME }} RAYLIB_BUILD_ARCH=${{ matrix.ARCH }} RAYLIB_LIBTYPE=SHARED RAYLIB_RELEASE_PATH="../build/${{ env.RELEASE_NAME }}/lib" -B
         cd ..
       shell: cmd
-      if: matrix.compiler == 'mingw-w64'
-      
+      if: matrix.compiler == 'mingw-w64' && matrix.bits == 32
+           
     - name: Build Library (MSVC16)
       run: |
         cd projects/VS2017