diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
new file mode 100644
index 0000000..6eb31c6
--- /dev/null
+++ b/.github/workflows/build_mac.yml
@@ -0,0 +1,51 @@
+name: Build latest (macOS 64 bit)
+on: [push]
+
+concurrency:
+  group: ${{ github.ref }}-mac64
+  cancel-in-progress: true
+
+jobs:
+  build:
+    if: github.ref_name == github.event.repository.default_branch
+    runs-on: ubuntu-latest
+    container:
+      image: fzwoch/osxcross
+    steps:
+      - uses: actions/checkout@v4
+      - name: Compile 64 bit macOS builds
+        shell: bash
+        id: compile
+        env: 
+          COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn"
+          MAC32_FLAGS:  "-fvisibility=hidden -rdynamic -DCC_BUILD_ICON"
+          MAC64_FLAGS:  "-fvisibility=hidden -rdynamic -DCC_BUILD_ICON"
+        run: |
+          LATEST_FLAG=-DCC_COMMIT_SHA=\"$(git rev-parse --short "$GITHUB_SHA")\"  
+          
+          cd src
+          MACOSX_DEPLOYMENT_TARGET=10.5 x86_64-apple-darwin9-cc *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC64_FLAGS }} $LATEST_FLAG -o cc-mac64-gl1 -framework Cocoa -framework OpenGL -framework IOKit -lobjc
+          MACOSX_DEPLOYMENT_TARGET=10.5 x86_64-apple-darwin9-cc *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC64_FLAGS }} $LATEST_FLAG -DCC_BUILD_GLMODERN -o cc-mac64-gl2 -framework Cocoa -framework OpenGL -framework IOKit -lobjc
+          
+          MACOSX_DEPLOYMENT_TARGET=10.5 i386-apple-darwin9-cc *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC32_FLAGS }} $LATEST_FLAG -o cc-mac32-gl1 -framework Cocoa -framework OpenGL -framework IOKit -lobjc
+          MACOSX_DEPLOYMENT_TARGET=10.5 i386-apple-darwin9-cc *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC32_FLAGS }} $LATEST_FLAG -DCC_BUILD_GLMODERN -o cc-mac32-gl2 -framework Cocoa -framework OpenGL -framework IOKit -lobjc
+
+
+      - uses: ./.github/actions/notify_failure
+        if: ${{ always() && steps.compile.outcome == 'failure' }}
+        with:
+          NOTIFY_MESSAGE: 'Failed to compile 64 bit macOS build'
+          WEBHOOK_URL: '${{ secrets.WEBHOOK_URL }}'
+          
+          
+      - uses: ./.github/actions/upload_build
+        if: ${{ always() && steps.compile.outcome == 'success' }}
+        with:
+          SOURCE_FILE: 'src/cc-mac64-gl1'
+          DEST_NAME: 'ClassiCube-mac64'
+          
+      - uses: ./.github/actions/upload_build
+        if: ${{ always() && steps.compile.outcome == 'success' }}
+        with:
+          SOURCE_FILE: 'src/cc-mac64-gl2'
+          DEST_NAME: 'ClassiCube-mac64-ModernGL'
\ No newline at end of file
diff --git a/.github/workflows/build_mac64.yml b/.github/workflows/build_mac64.yml
index 787deb1..510c10a 100644
--- a/.github/workflows/build_mac64.yml
+++ b/.github/workflows/build_mac64.yml
@@ -21,8 +21,8 @@ jobs:
           LATEST_FLAG=-DCC_COMMIT_SHA=\"$(git rev-parse --short "$GITHUB_SHA")\"  
           
           cd src
-          MACOSX_DEPLOYMENT_TARGET=10.6 clang *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC64_FLAGS }} $LATEST_FLAG -o cc-mac64-gl1 -framework Cocoa -framework OpenGL -framework IOKit -lobjc
-          MACOSX_DEPLOYMENT_TARGET=10.5 clang *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC64_FLAGS }} $LATEST_FLAG -DCC_BUILD_GLMODERN -o cc-mac64-gl2 -framework Cocoa -framework OpenGL -framework IOKit -lobjc
+          MACOSX_DEPLOYMENT_TARGET=10.9 clang *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC64_FLAGS }} $LATEST_FLAG -o cc-mac64-gl1 -framework Cocoa -framework OpenGL -framework IOKit -lobjc
+          MACOSX_DEPLOYMENT_TARGET=10.9 clang *.c interop_cocoa.m ${{ env.COMMON_FLAGS }} ${{ env.MAC64_FLAGS }} $LATEST_FLAG -DCC_BUILD_GLMODERN -o cc-mac64-gl2 -framework Cocoa -framework OpenGL -framework IOKit -lobjc
 
 
       - uses: ./.github/actions/notify_failure
diff --git a/.github/workflows/build_webclient2.yml b/.github/workflows/build_webclient2.yml
index 83f8262..4438185 100644
--- a/.github/workflows/build_webclient2.yml
+++ b/.github/workflows/build_webclient2.yml
@@ -7,6 +7,7 @@ concurrency:
 
 jobs:
   build:
+    if: github.ref_name == github.event.repository.default_branch
     runs-on: ubuntu-latest
     container:
       image: trzeci/emscripten-fastcomp:1.39.0