diff --git a/.github/workflows/build-libs.yml b/.github/workflows/build-libs.yml
index 40b6b1bc..763eac16 100644
--- a/.github/workflows/build-libs.yml
+++ b/.github/workflows/build-libs.yml
@@ -115,6 +115,7 @@ jobs:
         env:
           MACOS_CERTIFICATE: ${{ secrets.MACOS_DEVELOPER_ID_CERTIFICATE }}
           MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_DEVELOPER_ID_CERTIFICATE_PWD }}
+          MACOS_CERTIFICATE_ID: ${{ secrets.MACOS_DEVELOPER_ID_CERTIFICATE_IDENTITY }}
         run: |
           $env:TMP_PASS = [Guid]::NewGuid().ToString()
           [System.IO.File]::WriteAllBytes([System.IO.Path]::Combine($pwd.Path, "certificate.p12"), [System.Convert]::FromBase64String("$env:MACOS_CERTIFICATE"))
@@ -124,7 +125,7 @@ jobs:
           security list-keychains -s build.keychain
           security import certificate.p12 -k build.keychain -P $env:MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $env:TMP_PASS build.keychain
-          /usr/bin/codesign --force -s AEFB3DDA9FD6A31D3DD4D7A9398A59FDDA874DCC libokapi.dylib -v
+          /usr/bin/codesign --force -s $env:MACOS_CERTIFICATE_ID libokapi.dylib -v
         shell: pwsh
         working-directory: ./libs/macos
       - name: Upload MacOS artifact
diff --git a/devops/BuildLibraries.ps1 b/devops/BuildLibraries.ps1
index dae4075c..69f612a0 100644
--- a/devops/BuildLibraries.ps1
+++ b/devops/BuildLibraries.ps1
@@ -82,13 +82,18 @@ try {
             rustup toolchain install nightly --allow-downgrade
             rustup target add x86_64-apple-ios aarch64-apple-ios
             rustup target add aarch64-apple-ios-sim --toolchain nightly
-            
+            rustup component add rust-src --toolchain nightly-x86_64-apple-darwin
+
             cargo +nightly build --release --target aarch64-apple-ios-sim
             cargo build --release --target x86_64-apple-ios
             cargo build --release --target aarch64-apple-ios
 
+            cargo +nightly build --release -Z build-std --target x86_64-apple-ios-macabi
+            cargo +nightly build --release -Z build-std --target aarch64-apple-ios-macabi
+
             # Create the fat binaries, cargo-lipo doesn't support ios sim aarch64
             lipo -create "./target/x86_64-apple-ios/release/libokapi.a" "./target/aarch64-apple-ios-sim/release/libokapi.a" -output "$TargetOutput/libokapi_simulator.a"
+            lipo -create "./target/x86_64-apple-ios-macabi/release/libokapi.a" "./target/aarch64-apple-ios-macabi/release/libokapi.a" -output "$TargetOutput/libokapi_maccatalyst.a"
             Copy-Item -Path "./target/aarch64-apple-ios/release/libokapi.a" -Destination "$TargetOutput/libokapi.a"
             break
         }