diff --git a/.github/workflows/nightly-validation.yml b/.github/workflows/nightly-validation.yml
index 6cd68c393..ea372ccd8 100644
--- a/.github/workflows/nightly-validation.yml
+++ b/.github/workflows/nightly-validation.yml
@@ -716,7 +716,7 @@ jobs:
           TEST_PATH="/Users/runner/hostedtoolcache/z3/latest/x64/z3-4.15.5-x64-osx-15.7.3/bin/libz3.dylib"
           
           # Try to change the install name - this will fail if headerpad is insufficient
-          install_name_tool -id "$TEST_PATH" -change libz3.dylib "$TEST_PATH" libz3.dylib
+          install_name_tool -id "$TEST_PATH" -change "$ORIGINAL_NAME" "$TEST_PATH" libz3.dylib
           
           # Verify the change was successful
           NEW_NAME=$(otool -D libz3.dylib | tail -n 1)
@@ -768,7 +768,7 @@ jobs:
           TEST_PATH="/Users/runner/hostedtoolcache/z3/latest/arm64/z3-4.15.5-arm64-osx-15.7.3/bin/libz3.dylib"
           
           # Try to change the install name - this will fail if headerpad is insufficient
-          install_name_tool -id "$TEST_PATH" -change libz3.dylib "$TEST_PATH" libz3.dylib
+          install_name_tool -id "$TEST_PATH" -change "$ORIGINAL_NAME" "$TEST_PATH" libz3.dylib
           
           # Verify the change was successful
           NEW_NAME=$(otool -D libz3.dylib | tail -n 1)
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 2c91c7ce8..655973f14 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-latest
+    runs-on: macos-13
     timeout-minutes: 15
     steps:
       - name: Checkout code
@@ -109,7 +109,7 @@ jobs:
           TEST_PATH="/Users/runner/hostedtoolcache/z3/latest/x64/z3-test-dir/bin/libz3.dylib"
           
           # Try to change the install name - this will fail if headerpad is insufficient
-          install_name_tool -id "$TEST_PATH" -change libz3.dylib "$TEST_PATH" libz3.dylib
+          install_name_tool -id "$TEST_PATH" -change "$ORIGINAL_NAME" "$TEST_PATH" libz3.dylib
           
           # Verify the change was successful
           NEW_NAME=$(otool -D libz3.dylib | tail -n 1)
@@ -157,7 +157,7 @@ jobs:
           TEST_PATH="/Users/runner/hostedtoolcache/z3/latest/arm64/z3-test-dir/bin/libz3.dylib"
           
           # Try to change the install name - this will fail if headerpad is insufficient
-          install_name_tool -id "$TEST_PATH" -change libz3.dylib "$TEST_PATH" libz3.dylib
+          install_name_tool -id "$TEST_PATH" -change "$ORIGINAL_NAME" "$TEST_PATH" libz3.dylib
           
           # Verify the change was successful
           NEW_NAME=$(otool -D libz3.dylib | tail -n 1)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 13cbe3024..607ddc9f2 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-15
+    runs-on: macos-13
     timeout-minutes: 15
     steps:
       - name: Checkout code
@@ -128,7 +128,7 @@ jobs:
           TEST_PATH="/Users/runner/hostedtoolcache/z3/latest/x64/z3-test-dir/bin/libz3.dylib"
           
           # Try to change the install name - this will fail if headerpad is insufficient
-          install_name_tool -id "$TEST_PATH" -change libz3.dylib "$TEST_PATH" libz3.dylib
+          install_name_tool -id "$TEST_PATH" -change "$ORIGINAL_NAME" "$TEST_PATH" libz3.dylib
           
           # Verify the change was successful
           NEW_NAME=$(otool -D libz3.dylib | tail -n 1)
@@ -176,7 +176,7 @@ jobs:
           TEST_PATH="/Users/runner/hostedtoolcache/z3/latest/arm64/z3-test-dir/bin/libz3.dylib"
           
           # Try to change the install name - this will fail if headerpad is insufficient
-          install_name_tool -id "$TEST_PATH" -change libz3.dylib "$TEST_PATH" libz3.dylib
+          install_name_tool -id "$TEST_PATH" -change "$ORIGINAL_NAME" "$TEST_PATH" libz3.dylib
           
           # Verify the change was successful
           NEW_NAME=$(otool -D libz3.dylib | tail -n 1)