diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0a87e81..8de0fb9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,22 +21,39 @@ pr:
 
 jobs:
 - job: LinuxBuilds
+  pool:
+      vmImage: 'ubuntu-latest'
   strategy:
     matrix:
+      ubuntu_18_04_x86_64:
+        image: 'tfcollins/libiio_ubuntu_18_04-ci:latest'
+        arch: arm64
+        OS_TYPE: 'ubuntu_docker'
+        OS_VERSION: focal
+        artifactName: 'Linux-Ubuntu-18.04'
+        PACKAGE_TO_INSTALL: 'build/*.deb'
       ubuntu_20_04_x86_64:
-        imageName: 'ubuntu-20.04'
+        image: 'tfcollins/libiio_ubuntu_20_04-ci:latest'
+        arch: arm64
         OS_TYPE: 'ubuntu_docker'
         OS_VERSION: focal
         artifactName: 'Linux-Ubuntu-20.04'
         PACKAGE_TO_INSTALL: 'build/*.deb'
       ubuntu_22_04_x86_64:
-        imageName: 'ubuntu-22.04'
+        image: 'tfcollins/libiio_ubuntu_22_04-ci:latest'
+        arch: arm64
         OS_TYPE: 'ubuntu_docker'
         OS_VERSION: jammy
         artifactName: 'Linux-Ubuntu-22.04'
         PACKAGE_TO_INSTALL: 'build/*.deb'
-  pool:
-    vmImage: $(imageName)
+      debian_bullseye:
+        image: 'tfcollins/libiio_debian_bullseye-ci:latest'
+        arch: arm64
+        OS_TYPE: 'ubuntu_docker'
+        OS_VERSION: bullseye
+        artifactName: 'Linux-Debian-11'
+        PACKAGE_TO_INSTALL: 'build/*.deb'
+  container: $[ variables['image'] ]
   steps:
   - checkout: self
     fetchDepth: 1
@@ -50,7 +67,8 @@ jobs:
       runVersion: 'latestFromBranch'
       runBranch: 'refs/heads/master'
       path: '$(Agent.BuildDirectory)/s/build/'
-  - script: ./CI/travis/before_install_linux
+  - script: |
+    `python3 -m pip install pylibiio --no-binary :all:`
     displayName: "Install Dependencies"
   - script: ./CI/travis/make_linux
     displayName: "Build"
@@ -171,16 +189,35 @@ jobs:
       artifactName: '$(artifactName)'
 
 - job: macOSBuilds
+  workspace:
+    clean: all
   strategy:
     matrix:
       macOS_11:
-        imageName: 'macOS-11'
+        poolName: 'Azure Pipelines'
+        vmImage: 'macOS-11'
+        agentName: 'Azure Pipelines 4'
         artifactName: 'macOS-11'
       macOS_12:
-        imageName: 'macOS-12'
+        poolName: 'Azure Pipelines'
+        vmImage: 'macOS-12'
+        agentName: 'Azure Pipelines 3'
         artifactName: 'macOS-12'
+      macOS_13_x64:
+        poolName: 'Azure Pipelines'
+        vmImage: 'macOS-13'
+        agentName: 'Azure Pipelines 2'
+        artifactName: 'macOS-13-x64'
+      macOS_13_arm64:
+        poolName: 'Default'
+        vmImage:
+        agentName: 'macOS_arm64'
+        artifactName: 'macOS-13-arm64'
   pool:
-    vmImage: $(imageName)
+    name: $(poolName)
+    vmImage: $(vmImage)
+    demands:
+      - agent.name -equals $(agentName)
   variables:
     PACKAGE_TO_INSTALL: 'build/*.pkg'
   steps: