diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 6e2cc56ef..d15b1e952 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -77,7 +77,7 @@ jobs:
   validate-macos-headerpad-x64:
     name: "Validate macOS x64 dylib headerpad"
     needs: [mac-build-x64]
-    runs-on: macos-13
+    runs-on: macos-latest
     timeout-minutes: 15
     steps:
       - name: Checkout code
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 36f57ed64..bf6150b1b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -96,7 +96,7 @@ jobs:
   validate-macos-headerpad-x64:
     name: "Validate macOS x64 dylib headerpad"
     needs: [mac-build-x64]
-    runs-on: macos-13
+    runs-on: macos-15
     timeout-minutes: 15
     steps:
       - name: Checkout code
diff --git a/src/api/ml/CMakeLists.txt b/src/api/ml/CMakeLists.txt
index a1a4f5a69..b35c4ac4c 100644
--- a/src/api/ml/CMakeLists.txt
+++ b/src/api/ml/CMakeLists.txt
@@ -161,7 +161,7 @@ endif()
 if( APPLE )
   # set(ocaml_rpath "@executable_path/../libz3${so_ext}")
   # Add headerpad for install_name_tool compatibility on macOS
-  list(APPEND c_lib_deps "-Wl,-headerpad_max_install_names")
+  list(APPEND c_lib_deps "-ldopt" "-Wl,-headerpad_max_install_names")
 elseif( UNIX )
   set(ocaml_rpath "\\$ORIGIN/../libz3${so_ext}")
   list(APPEND c_lib_deps "-dllpath" ${ocaml_rpath})