diff --git a/CI/travis/before_install_darwin b/CI/travis/before_install_darwin
deleted file mode 100755
index 8244b43e..00000000
--- a/CI/travis/before_install_darwin
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -e
-
-. CI/travis/lib.sh
-
-# Note: not installing 'mono', it comes with Azure images,
-# but it doesn't look it's installed with Homebrew
-
-brew_install_if_not_exists cmake doxygen libusb libxml2 swig curl python
-
-if [ -n "$PACKAGE_TO_INSTALL" ] ; then
-	for file in $PACKAGE_TO_INSTALL ; do
-		sudo installer -pkg "${file}" -target /
-	done
-elif [ "$INSTALL_FROM_SW_DOWNLOADS" = "1" ] ; then
-	wget http://swdownloads.analog.com/cse/travis_builds/${LIBIIO_BRANCH}_latest_libiio${LDIST}.pkg
-	sudo installer -pkg ${LIBIIO_BRANCH}_latest_libiio${LDIST}.pkg -target /
-fi
-
-cd ${TOP_DIR}
-git clone --branch v0.4.0 --depth 1 https://github.com/google/glog
-mkdir -p glog/build_0_4_0 && cd glog/build_0_4_0
-cmake ..
-make
-sudo make install
-
-pip3 install wheel twine build virtualenv
diff --git a/CI/travis/install_deps_darwin b/CI/travis/install_deps_darwin
new file mode 100755
index 00000000..b36ed34c
--- /dev/null
+++ b/CI/travis/install_deps_darwin
@@ -0,0 +1,44 @@
+#!/bin/sh -e
+
+TOP_DIR=$(pwd)
+LIBIIO_VERSION=libiio-v0
+
+. CI/travis/lib.sh
+
+# Note: not installing 'mono', it comes with Azure images,
+# but it doesn't look it's installed with Homebrew
+
+brew_install_if_not_exists cmake doxygen libusb libxml2 swig curl python
+# libiio deps
+brew_install_if_not_exists doxygen libusb libxml2 ncurses cdk libserialport sphinx-doc pkg-config
+pip3 install sphinx
+
+if [ -n "$PACKAGE_TO_INSTALL" ] ; then
+	for file in $PACKAGE_TO_INSTALL ; do
+		sudo installer -pkg "${file}" -target /
+	done
+# elif [ "$INSTALL_FROM_SW_DOWNLOADS" = "1" ] ; then
+# 	wget http://swdownloads.analog.com/cse/travis_builds/${LIBIIO_BRANCH}_latest_libiio${LDIST}.pkg
+# 	sudo installer -pkg ${LIBIIO_BRANCH}_latest_libiio${LDIST}.pkg -target /
+fi
+
+pip3 install wheel twine build virtualenv
+
+# Install glog
+echo "Building glog"
+cd ${TOP_DIR}
+git clone --branch v0.4.0 --depth 1 https://github.com/google/glog
+mkdir -p glog/build_0_4_0 && cd glog/build_0_4_0
+cmake ..
+make
+sudo make install
+
+# Install libiio
+echo "Building libiio - version $LIBIIO_VERSION"
+cd ${TOP_DIR}
+git clone https://github.com/analogdevicesinc/libiio.git -b $LIBIIO_VERSION libiio
+mkdir ./libiio/build && cd ./libiio/build
+cmake ../
+make
+sudo make install 
+
diff --git a/CI/travis/before_install_linux b/CI/travis/install_deps_linux
similarity index 68%
rename from CI/travis/before_install_linux
rename to CI/travis/install_deps_linux
index 592c3392..4c2fc054 100755
--- a/CI/travis/before_install_linux
+++ b/CI/travis/install_deps_linux
@@ -1,17 +1,10 @@
 #!/bin/sh -e
 
 TOP_DIR=$(pwd)
+LIBIIO_VERSION=libiio-v0
 
 . CI/travis/lib.sh
 
-get_libiio_release() {
-	git clone https://github.com/analogdevicesinc/libiio && cd libiio
-	IIO_TAG=`git describe --tags $(git rev-list --tags --max-count=1)`
-	git checkout ${IIO_TAG}
-	IIO_TAG_SHA=${IIO_TAG}.g`git rev-parse --short HEAD`
-	wget https://github.com/analogdevicesinc/libiio/releases/download/${IIO_TAG}/libiio-${IIO_TAG_SHA}${LDIST}.deb
-}
-
 handle_centos() {
 	# FIXME: see about adding `libserialport-dev` from EPEL ; maybe libusb-1.0.0-devel...
 	yum -y groupinstall 'Development Tools'
@@ -27,9 +20,9 @@ handle_centos() {
 
 	if [ -n "$PACKAGE_TO_INSTALL" ] ; then
 		sudo yum localinstall -y $PACKAGE_TO_INSTALL
-	elif [ "$INSTALL_FROM_SW_DOWNLOADS" = "1" ] ; then
-		wget https://swdownloads.analog.com/cse/azure_builds/${artifactName}_latest_${LIBIIO_BRANCH}_libiio.deb
-		sudo dpkg -i ./${artifactName}_latest_${LIBIIO_BRANCH}_libiio.deb
+	# elif [ "$INSTALL_FROM_SW_DOWNLOADS" = "1" ] ; then
+	# 	wget https://swdownloads.analog.com/cse/azure_builds/${artifactName}_latest_${LIBIIO_BRANCH}_libiio.deb
+	# 	sudo dpkg -i ./${artifactName}_latest_${LIBIIO_BRANCH}_libiio.deb
 	fi
 }
 
@@ -45,14 +38,21 @@ handle_default() {
 		python3-dev python3-setuptools python3-pip python3-all \
 		debhelper devscripts fakeroot libserialport-dev swig dh-python
 
+	# libiio dependencies
+    sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
+        libxml2-dev bison flex libcdk5-dev cmake \
+        libaio-dev libusb-1.0-0-dev \
+        libserialport-dev libavahi-client-dev \	
+
 	if [ -n "$PACKAGE_TO_INSTALL" ] ; then
 		sudo dpkg -i $PACKAGE_TO_INSTALL
-	elif [ "$INSTALL_FROM_SW_DOWNLOADS" = "1" ] ; then
-		wget https://swdownloads.analog.com/cse/azure_builds/${artifactName}_latest_${LIBIIO_BRANCH}_libiio.deb
-		sudo dpkg -i ./${artifactName}_latest_${LIBIIO_BRANCH}_libiio.deb
+	# elif [ "$INSTALL_FROM_SW_DOWNLOADS" = "1" ] ; then
+	# 	wget https://swdownloads.analog.com/cse/azure_builds/${artifactName}_latest_${LIBIIO_BRANCH}_libiio.deb
+	# 	sudo dpkg -i ./${artifactName}_latest_${LIBIIO_BRANCH}_libiio.deb
 	fi
 
 	#Install glog
+	echo "Building glog"
 	cd ${TOP_DIR}
 	git clone --branch v0.4.0 --depth 1 https://github.com/google/glog
 	mkdir -p glog/build_0_4_0 && cd glog/build_0_4_0
@@ -61,6 +61,15 @@ handle_default() {
 	sudo make install
 
 	sudo pip3 install --upgrade pip stdeb argparse
+
+	# Install libiio
+	echo "Building libiio - version $LIBIIO_VERSION"
+	cd ${TOP_DIR}
+	git clone https://github.com/analogdevicesinc/libiio.git -b $LIBIIO_VERSION libiio
+	mkdir ./libiio/build && cd ./libiio/build
+	cmake ../
+	make
+	sudo make install 
 }
 
 handle_doxygen() {
diff --git a/CI/travis/lib.sh b/CI/travis/lib.sh
index 7fea98d6..22de6fbf 100644
--- a/CI/travis/lib.sh
+++ b/CI/travis/lib.sh
@@ -2,7 +2,7 @@
 
 TRAVIS_BUILD_DIR=${TRAVIS_BUILD_DIR:-'./'}
 
-LIBIIO_BRANCH=master
+LIBIIO_BRANCH=libiio-v0
 
 command_exists() {
 	local cmd=$1
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1980ebed..0b7718c8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -25,7 +25,8 @@ parameters:
   - name: pythonVersions
     type: object
     default:
-    - '3.10'
+    - '3.11'
+    - 3.10
     - 3.9
     - 3.8
     - 3.7
@@ -59,17 +60,7 @@ jobs:
     fetchDepth: 1
     clean: true
     persistCredentials: true
-  - task: DownloadPipelineArtifact@2
-    displayName: 'Get libiio artifacts'
-    inputs:
-      source: 'specific'
-      project: '$(AnalogDevices_OpenSource_GUID)'
-      pipeline: $(libiioPipelineId)
-      artifact: '$(artifactName)'
-      runVersion: 'latestFromBranch'
-      runBranch: 'refs/heads/master'
-      path: '$(Agent.BuildDirectory)/s/build/'
-  - script: ./CI/travis/before_install_linux
+  - script: ./CI/travis/install_deps_linux
     displayName: "Install Dependencies"
   - script: ./CI/travis/make_linux
     displayName: "Build"
@@ -121,17 +112,7 @@ jobs:
   - checkout: self
     fetchDepth: 1
     clean: true
-  - task: DownloadPipelineArtifact@2
-    displayName: 'Get libiio artifacts'
-    inputs:
-      source: 'specific'
-      project: '$(AnalogDevices_OpenSource_GUID)'
-      pipeline: $(libiioPipelineId)
-      artifact: '$(artifactName)'
-      runVersion: 'latestFromBranch'
-      runBranch: 'refs/heads/master'
-      path: '$(Agent.BuildDirectory)/s/build/'
-  - script: ./CI/travis/before_install_darwin
+  - script: ./CI/travis/install_deps_darwin
     displayName: "Install Dependencies"
     condition: ne(variables['agentName'],'macOS_arm64')
   - script: ./CI/travis/make_darwin