diff --git a/openairinterface5g/openairinterface-install-scripts/oai_gNB_and_UE_install.sh b/openairinterface5g/openairinterface-install-scripts/oai_gNB_and_UE_install.sh
index 7e50b79724dc29040c45b28276a444c35225d093..6bdba3a9a731023afa5d01733ef89c5994c16404 100755
--- a/openairinterface5g/openairinterface-install-scripts/oai_gNB_and_UE_install.sh
+++ b/openairinterface5g/openairinterface-install-scripts/oai_gNB_and_UE_install.sh
@@ -9,9 +9,8 @@ sudo apt-get update -y
 ## OAI dependencies
 ## Testar com a libuhd4.4.0 ao invés de libuhd4.2.0u
 sudo apt-get install libuhd-dev libdpdk-dev uhd-host -y
-sudo apt-get install libuhd4.2.0 libuhd4.4.0 y					# Required for OpenAirInterface install
-sudo dpkg -i --force-overwrite /var/cache/apt/archives/libuhd4.2.0_4.2.0.1-0ubuntu1~focal1_amd64.deb
-sudo dpkg -i --force-overwrite /var/cache/apt/archives/libuhd4.4.0_4.4.0.0-0ubuntu1~focal1_amd64.deb
+sudo apt-get install libuhd4.6.0 -y					# Required for OpenAirInterface install
+sudo dpkg -i --force-overwrite /var/cache/apt/archives/libuhd4.6.0_4.6.0.0-0ubuntu1~focal1_amd64.deb
 
 # Work directory path is the current directory
 WORK_DIR=$HOME
@@ -20,15 +19,13 @@ WORK_DIR=$HOME
 cd $WORK_DIR/
 git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
 cd $WORK_DIR/openairinterface5g
-git checkout develop
+git checkout v2.1.0
 git config --global user.email "you@example.com"
 git config --global user.name "Your Name"
 
-## Download the OAI configuration files (CU/DU, OAI UE, and gNB configuration)
-wget -O $WORK_DIR/openairinterface5g/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf https://projetos.imd.ufrn.br/reginalab/sdran-openairinterface/-/raw/main/openairinterface5g/openairinterface-conf/basic_deployment/ue.conf?inline=false
-wget -O $WORK_DIR/openairinterface5g/targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf https://projetos.imd.ufrn.br/reginalab/sdran-openairinterface/-/raw/main/openairinterface5g/openairinterface-conf/flexric_gNB_UE/gnb.sa.band78.fr1.106PRB.usrpb210.conf?inline=false
 
 source oaienv
 cd cmake_targets
-sudo ./build_oai -I -w USRP -i
-sudo ./build_oai --gNB --nrUE -c -C -w USRP
+
+sudo ./build_oai -I --install-optional-packages
+sudo ./build_oai --gNB --nrUE -C -w USRP --ninja --build-lib "uescope nrscope"