diff --git a/.github/workflows/ci_steps.yml b/.github/workflows/ci_steps.yml
index b9017c1d4..7d2bfa86f 100644
--- a/.github/workflows/ci_steps.yml
+++ b/.github/workflows/ci_steps.yml
@@ -48,6 +48,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3.6.0
 
+      - name: Install Dependencies
+        run: |
+          share/ci/scripts/install_imath.sh main
+          share/ci/scripts/install_libdeflate.sh master
+          share/ci/scripts/install_help2man.sh
+        shell: bash
+
       - name: Create build directories
         run: |
           mkdir _install
@@ -61,7 +68,6 @@ jobs:
                 -DCMAKE_INSTALL_PREFIX=_install \
                 -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} \
                 -DOPENEXR_CXX_STANDARD=${{ inputs.cxx-standard }} \
-                -DCMAKE_CXX_FLAGS='${{ inputs.cxx-flags }}' \
                 -DBUILD_SHARED_LIBS=${{ inputs.BUILD_SHARED_LIBS }} \
                 -DOPENEXR_ENABLE_THREADING=${{ inputs.OPENEXR_ENABLE_THREADING }} \
                 -DOPENEXR_INSTALL_PKG_CONFIG=${{ inputs.OPENEXR_INSTALL_PKG_CONFIG }} \
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
index 2843ca3c8..5e00f5f39 100644
--- a/.github/workflows/ci_workflow.yml
+++ b/.github/workflows/ci_workflow.yml
@@ -123,7 +123,7 @@ jobs:
     name: 'macOS ${{ matrix.build}}: ${{ matrix.label }}'
     uses: ./.github/workflows/ci_steps.yml
     with:
-      os: ${{ matrix.os }}
+      os: ${{ matrix.os || 'macos-14' }}
       vfx-cy: ${{ matrix.vfx-cy || '2024' }}
       compiler-desc: ${{ matrix.compiler-desc || 'AppleClang11.0' }}
       cxx-compiler: ${{ matrix.cxx-compiler }}
@@ -150,7 +150,7 @@ jobs:
 
           - build: 2
             label: Release
-
+                   
           - build: 3
             label: Static
             BUILD_SHARED_LIBS: 'OFF'
@@ -169,6 +169,15 @@ jobs:
             OPENEXR_FORCE_INTERNAL_DEFLATE: 'ON'
             BUILD_TESTING: 'OFF'
 
+          - build: 6
+            label: macos-13
+            os: macos-13
+
+          - build: 7
+            label: macos-12
+            os: macos-12
+
+
   windows:
     name: 'Windows ${{ matrix.build}}: ${{ matrix.label }}'
     uses: ./.github/workflows/ci_steps.yml
@@ -183,7 +192,7 @@ jobs:
       BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
       OPENEXR_ENABLE_THREADING: ${{ matrix.OPENEXR_ENABLE_THREADING || 'ON' }}
       OPENEXR_INSTALL_PKG_CONFIG: ${{ matrix.OPENEXR_INSTALL_PKG_CONFIG || 'ON' }}
-      OPENEXR_INSTALL_DOCS: ${{ matrix.OPENEXR_INSTALL_DOCS || 'ON' }}
+      OPENEXR_INSTALL_DOCS: ${{ matrix.OPENEXR_INSTALL_DOCS || 'OFF' }}
       OPENEXR_BUILD_EXAMPLES: ${{ matrix.OPENEXR_BUILD_EXAMPLES || 'ON' }}
       OPENEXR_BUILD_TOOLS: ${{ matrix.OPENEXR_BUILD_TOOLS || 'ON' }}
       OPENEXR_BUILD_PYTHON: ${{ matrix.OPENEXR_BUILD_PYTHON || 'OFF' }}
@@ -199,7 +208,6 @@ jobs:
 
           - build: 2
             label: Release
-            build-type: Debug