diff --git a/Utilities/Pipelines/Tasks/ios-build.yml b/Utilities/Pipelines/Tasks/ios-build.yml
index d4d8748d..8de16b73 100644
--- a/Utilities/Pipelines/Tasks/ios-build.yml
+++ b/Utilities/Pipelines/Tasks/ios-build.yml
@@ -5,17 +5,6 @@ parameters:
 steps:
   - template: checkout.yml
 
-  # Build the CMake static lib
-  - script: |
-      cmake -B Build/libHttpClient.iOS.CMake/build \
-            -S Build/libHttpClient.iOS.CMake \
-            -DCMAKE_SYSTEM_NAME=iOS \
-            -DCMAKE_OSX_ARCHITECTURES=arm64 \
-            -DCMAKE_BUILD_TYPE=${{ parameters.configuration }}
-      cmake --build Build/libHttpClient.iOS.CMake/build --config ${{ parameters.configuration }}
-    displayName: 'Clean build iOS CMake static lib'
-
-  # Build libHttpClient.Apple.C configurations
   - task: Xcode@5
     displayName: 'Clean build iOS static lib'
     inputs:
@@ -25,6 +14,7 @@ steps:
       xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
       scheme: 'libHttpClient_iOS'
       packageApp: false
+      useXcpretty: false
 
   - task: Xcode@5
     displayName: 'Clean build iOS framework'
@@ -35,6 +25,7 @@ steps:
       xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
       scheme: 'libHttpClientFramework_iOS'
       packageApp: false
+      useXcpretty: false
 
   - task: Xcode@5
     displayName: 'Clean build iOS_NOWEBSOCKETS static lib'
@@ -45,6 +36,7 @@ steps:
       xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
       scheme: 'libHttpClient_NOWEBSOCKETS_iOS'
       packageApp: false
+      useXcpretty: false
 
   - task: Xcode@5
     displayName: 'Clean build iOS_NOWEBSOCKETS framework'
@@ -55,44 +47,5 @@ steps:
       xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
       scheme: 'libHttpClientFramework_NOWEBSOCKETS_iOS'
       packageApp: false
-
-  - task: Xcode@5
-    displayName: 'Clean build macOS static lib'
-    inputs:
-      actions: 'clean build'
-      configuration: ${{ parameters.configuration }}
-      sdk: 'macosx'
-      xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
-      scheme: 'libHttpClient_macOS'
-      packageApp: false
-
-  - task: Xcode@5
-    displayName: 'Clean build macOS framework'
-    inputs:
-      actions: 'clean build'
-      configuration: ${{ parameters.configuration }}
-      sdk: 'macosx'
-      xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
-      scheme: 'libHttpClientFramework_macOS'
-      packageApp: false
-
-  - task: Xcode@5
-    displayName: 'Clean build macOS_NOWEBSOCKETS static lib'
-    inputs:
-      actions: 'clean build'
-      configuration: ${{ parameters.configuration }}
-      sdk: 'macosx'
-      xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
-      scheme: 'libHttpClient_NOWEBSOCKETS_macOS'
-      packageApp: false
-
-  - task: Xcode@5
-    displayName: 'Clean build macOS_NOWEBSOCKETS framework'
-    inputs:
-      actions: 'clean build'
-      configuration: ${{ parameters.configuration }}
-      sdk: 'macosx'
-      xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
-      scheme: 'libHttpClientFramework_NOWEBSOCKETS_macOS'
-      packageApp: false
+      useXcpretty: false
 
diff --git a/Utilities/Pipelines/Tasks/ios-cmake-build.yml b/Utilities/Pipelines/Tasks/ios-cmake-build.yml
new file mode 100644
index 00000000..45b6fd2b
--- /dev/null
+++ b/Utilities/Pipelines/Tasks/ios-cmake-build.yml
@@ -0,0 +1,15 @@
+parameters:
+  - name: configuration
+    type: string
+
+steps:
+  - template: checkout.yml
+
+  - script: |
+      cmake -B Build/libHttpClient.iOS.CMake/build \
+            -S Build/libHttpClient.iOS.CMake \
+            -DCMAKE_SYSTEM_NAME=iOS \
+            -DCMAKE_OSX_ARCHITECTURES=arm64 \
+            -DCMAKE_BUILD_TYPE=${{ parameters.configuration }}
+      cmake --build Build/libHttpClient.iOS.CMake/build --config ${{ parameters.configuration }}
+    displayName: 'Build iOS CMake static lib'
diff --git a/Utilities/Pipelines/Tasks/macos-build.yml b/Utilities/Pipelines/Tasks/macos-build.yml
new file mode 100644
index 00000000..b412ac58
--- /dev/null
+++ b/Utilities/Pipelines/Tasks/macos-build.yml
@@ -0,0 +1,50 @@
+parameters:
+  - name: configuration
+    type: string
+
+steps:
+  - template: checkout.yml
+
+  - task: Xcode@5
+    displayName: 'Clean build macOS static lib'
+    inputs:
+      actions: 'clean build'
+      configuration: ${{ parameters.configuration }}
+      sdk: 'macosx'
+      xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
+      scheme: 'libHttpClient_macOS'
+      packageApp: false
+      useXcpretty: false
+
+  - task: Xcode@5
+    displayName: 'Clean build macOS framework'
+    inputs:
+      actions: 'clean build'
+      configuration: ${{ parameters.configuration }}
+      sdk: 'macosx'
+      xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
+      scheme: 'libHttpClientFramework_macOS'
+      packageApp: false
+      useXcpretty: false
+
+  - task: Xcode@5
+    displayName: 'Clean build macOS_NOWEBSOCKETS static lib'
+    inputs:
+      actions: 'clean build'
+      configuration: ${{ parameters.configuration }}
+      sdk: 'macosx'
+      xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
+      scheme: 'libHttpClient_NOWEBSOCKETS_macOS'
+      packageApp: false
+      useXcpretty: false
+
+  - task: Xcode@5
+    displayName: 'Clean build macOS_NOWEBSOCKETS framework'
+    inputs:
+      actions: 'clean build'
+      configuration: ${{ parameters.configuration }}
+      sdk: 'macosx'
+      xcWorkspacePath: Build/libHttpClient.Apple.C/libHttpClient.xcworkspace
+      scheme: 'libHttpClientFramework_NOWEBSOCKETS_macOS'
+      packageApp: false
+      useXcpretty: false
diff --git a/Utilities/Pipelines/libHttpClient.CI.yml b/Utilities/Pipelines/libHttpClient.CI.yml
index 42eef470..0646f9d4 100644
--- a/Utilities/Pipelines/libHttpClient.CI.yml
+++ b/Utilities/Pipelines/libHttpClient.CI.yml
@@ -96,6 +96,22 @@ jobs:
   # iOS
   ####################
 
+  - job: iOSCMakeBuild
+    displayName: libHttpClient iOS CMake Build
+    pool:
+      vmImage: macOS-15
+    timeoutInMinutes: 180
+    strategy:
+      matrix:
+        Debug:
+          Configuration: Debug
+        Release:
+          Configuration: Release
+    steps:
+      - template: Tasks/ios-cmake-build.yml
+        parameters:
+          configuration: $(Configuration)
+
   - job: iOSBuild
     displayName: libHttpClient iOS Build
     pool:
@@ -112,6 +128,22 @@ jobs:
         parameters:
           configuration: $(Configuration)
 
+  - job: macOSBuild
+    displayName: libHttpClient macOS Build
+    pool:
+      vmImage: macOS-15
+    timeoutInMinutes: 180
+    strategy:
+      matrix:
+        Debug:
+          Configuration: Debug
+        Release:
+          Configuration: Release
+    steps:
+      - template: Tasks/macos-build.yml
+        parameters:
+          configuration: $(Configuration)
+
   ####################
   # Linux
   ####################