diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 46266aa15..35bd7c4c1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,11 +14,16 @@ on:
         description: 'Build Year'
         required: true
         default: '2100'
+      onlyLatest:
+        description: "Only Latest Xcode"
+        type: 'boolean'
+        required: false
+        default: false
 
 
 env:
   WORKSPACE: ${{ github.workspace }}
-  DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
   BUILD_NUMBER: ${{ github.event.inputs.buildNumber }}
   YEAR: ${{ github.event.inputs.buildYear }}
 
@@ -26,7 +31,6 @@ env:
 jobs:
   source-code:
     name: Check out and process source code
-    if: "!contains(github.ref, 'refs/tags/') || github.repository == 'coronalabs/corona'"
     runs-on: macos-12
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
@@ -45,7 +49,7 @@ jobs:
 
   native:
     needs: source-code
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Get processed code
@@ -70,9 +74,10 @@ jobs:
     strategy:
       matrix:
         runner:
-          - macos-13
+          - macos-14
         xcode:
           - Xcode_15.3
+          - Xcode_15.4
         target:
           - template
           - template-angle
@@ -110,6 +115,7 @@ jobs:
 
 
   Xcode-template-matrix-13:
+    if: (! github.event.inputs.onlyLatest)
     strategy:
       matrix:
         runner:
@@ -152,6 +158,7 @@ jobs:
           path: ./output
 
   Xcode-template-matrix-12:
+    if: (! github.event.inputs.onlyLatest)
     strategy:
       matrix:
         runner:
@@ -199,6 +206,7 @@ jobs:
 
 
   Xcode-template-matrix:
+    if: (! github.event.inputs.onlyLatest)
     strategy:
       matrix:
         runner:
@@ -251,6 +259,7 @@ jobs:
       - Xcode-template-matrix-13
       - Xcode-template-matrix-14
     runs-on: ubuntu-20.04
+    if: (! failure() && ! cancelled())
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - uses: actions/checkout@v4
@@ -275,6 +284,8 @@ jobs:
     needs:
       - source-code
     runs-on: macos-13
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Set up emsdk
@@ -423,7 +434,7 @@ jobs:
 
   CoronaCards-iOS:
     needs: source-code
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Get processed code
@@ -450,7 +461,7 @@ jobs:
 
   CoronaCards-iOS-angle:
     needs: source-code
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Get processed code
@@ -484,7 +495,8 @@ jobs:
       - native
       - webtemplate
       - linux
-    runs-on: macos-13
+    if: (! failure() && ! cancelled())
+    runs-on: macos-14
     steps:
       - run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
       - name: Get processed code
@@ -537,7 +549,7 @@ jobs:
         run: |
           curl -sL https://github.com/coronalabs/binary-data/releases/download/1.0/jre.macos.tgz -o jre.macos.tgz
       - name: required for appdmg
-        run: python3 -m pip install setuptools
+        run: brew install python-setuptools
       - name: install appdmg
         run: npm install -g appdmg
       - name: install imagemagick
@@ -568,7 +580,7 @@ jobs:
 
 
   check-notarization:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - name: Check notarization credentials
         run: |