diff --git a/openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_install.sh b/openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_install.sh
index ff40f1f21e40c4a4766fad02b85bf7eb88480545..708da918e62d08d717998c1288f6c8518f6719f1 100755
--- a/openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_install.sh
+++ b/openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_install.sh
@@ -1,60 +1,64 @@
 #!/bin/bash
 
-sudo apt update -y
+## Repository OAI dependencies
+sudo add-apt-repository ppa:ettusresearch/uhd -y
+sudo apt-get update -y
 
 ## Install dependencies 
-
 sudo apt-get install -y autotools-dev
 sudo apt-get install -y automake
 sudo apt-get install -y libpcre2-dev
 sudo apt-get install -y pcre2-utils
-sudo apt-get install bison -y
-sudo apt-get install byacc -y
-sudo apt install g++ -y
-sudo apt install libsctp-dev python3.8 cmake-curses-gui libpcre2-dev python3-dev -y
-## Configure swig
-
-git clone https://github.com/swig/swig.git ~/swig
-cd ~/swig
+sudo apt-get install -y bison
+sudo apt-get install -y byacc
+sudo apt-get install -y g++ 
+sudo apt-get install -y libsctp-dev python3.8 libpcre2-dev python3-dev 
+
+## OAI dependencies
+sudo apt-get install libuhd-dev uhd-host -y
+sudo apt-get install libuhd4.2.0 -y
+sudo dpkg -i --force-overwrite /var/cache/apt/archives/libuhd4.2.0_4.2.0.1-0ubuntu1~focal1_amd64.deb
+
+# Work directory path is the current directory
+WORK_DIR=`pwd`
+
+## Configure swig - required for flexric
+cd $WORK_DIR/
+git clone https://github.com/swig/swig.git
+cd $WORK_DIR/swig
 ./autogen.sh
 ./configure --prefix=/usr/
-sudo make
+make
 sudo make install
 
 ## Install FlexRIC
-
-git clone https://gitlab.eurecom.fr/mosaic5g/flexric.git ~/flexric
-cd ~/flexric
+cd $WORK_DIR/
+git clone https://gitlab.eurecom.fr/mosaic5g/flexric.git
+cd $WORK_DIR/flexric
 git checkout v1.0.0
-mkdir ~/flexric/build
-cd ~/flexric/build
-sudo cmake ..
-sudo make
+mkdir $WORK_DIR/flexric/build
+cd $WORK_DIR/flexric/build
+cmake ..
+make
 sudo make install
 
-## Install OAI dependencies
 
-sudo add-apt-repository ppa:ettusresearch/uhd -y
-sudo apt-get update -y
-sudo apt-get install libuhd-dev uhd-host -y
-sudo apt-get install libuhd4.2.0 -y
-sudo dpkg -i --force-overwrite /var/cache/apt/archives/libuhd4.2.0_4.2.0.1-0ubuntu1~focal1_amd64.deb
 
 ## Install OAI UE and OAI gNB
-
-git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git  ~/oai
-cd ~/oai
+cd $WORK_DIR/
+git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
+mv openairinterface5g oai
+cd $WORK_DIR/oai
 git checkout 2022.41
-sudo git config --global user.email "you@example.com"
-sudo git config --global user.name "Your Name"
-sudo git am ~/flexric/multiRAT/oai/oai.patch --whitespace=nowarn
+git config --global user.email "you@example.com"
+git config --global user.name "Your Name"
+git am $WORK_DIR/flexric/multiRAT/oai/oai.patch --whitespace=nowarn
 
 ## Download the OAI configuration files (CU/DU, OAI UE, and gNB configuration)
-
-sudo wget -O ~/oai/executables/nr-softmodem.c https://projetos.imd.ufrn.br/reginalab/sdran-openairinterface/-/raw/main/openairinterface5g/openairinterface-conf/nr-softmodem.c?inline=false
-sudo wget -O ~/oai/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf https://projetos.imd.ufrn.br/reginalab/sdran-openairinterface/-/raw/main/openairinterface5g/openairinterface-conf/basic_deployment/cu_gnb.conf?inline=false
-sudo wget -O ~/oai/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf https://projetos.imd.ufrn.br/reginalab/sdran-openairinterface/-/raw/main/openairinterface5g/openairinterface-conf/basic_deployment/du_gnb.conf?inline=false
-sudo wget -O ~/oai/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
+sudo wget -O $WORK_DIR/oai/executables/nr-softmodem.c https://projetos.imd.ufrn.br/reginalab/sdran-openairinterface/-/raw/main/openairinterface5g/openairinterface-conf/nr-softmodem.c?inline=false
+sudo wget -O $WORK_DIR/oai/targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf https://projetos.imd.ufrn.br/reginalab/sdran-openairinterface/-/raw/main/openairinterface5g/openairinterface-conf/basic_deployment/cu_gnb.conf?inline=false
+sudo wget -O $WORK_DIR/oai/targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf https://projetos.imd.ufrn.br/reginalab/sdran-openairinterface/-/raw/main/openairinterface5g/openairinterface-conf/basic_deployment/du_gnb.conf?inline=false
+sudo wget -O $WORK_DIR/oai/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
 
 source oaienv
 cd cmake_targets