diff --git a/openairinterface5g/openairinterface-conf/basic_deployment/run_SIMU_oai_ran_w_UE.sh b/openairinterface5g/openairinterface-conf/basic_deployment/run_SIMU_oai_ran_w_UE.sh
index 40b10417138c80666b2acf8aedf7009a832f9a5e..059e5d92407eb4a16b742cd49188651f7ebc32eb 100755
--- a/openairinterface5g/openairinterface-conf/basic_deployment/run_SIMU_oai_ran_w_UE.sh
+++ b/openairinterface5g/openairinterface-conf/basic_deployment/run_SIMU_oai_ran_w_UE.sh
@@ -22,6 +22,6 @@ tmux send-keys -t 1 'cd ~/oai/cmake_targets/ran_build/build/' ENTER \; send-keys
 tmux send-keys -t 2 'cd ~/flexric/' ENTER \; send-keys -t 2 './build/examples/ric/nearRT-RIC' ENTER;
 
 ## Run OAI UE
-tmux send-keys -t 3 'cd ~/oai/cmake_targets/ran_build/build/' ENTER \; send-keys -t 3 'sleep 30' ENTER \; send-keys -t 3 'sudo RFSIMULATOR=192.168.70.129 ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --sa --nokrnmod -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf' ENTER;
+tmux send-keys -t 3 'cd ~/oai/cmake_targets/ran_build/build/' ENTER \; send-keys -t 3 'sleep 20' ENTER \; send-keys -t 3 'sudo RFSIMULATOR=192.168.70.129 ./nr-uesoftmodem -r 106 --numerology 1 --band 78 -C 3619200000 --rfsim --sa --nokrnmod -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.conf' ENTER;
 
 tmux attach-session -t $session
diff --git a/openairinterface5g/openairinterface-install-scripts/.gitkeep b/openairinterface5g/openairinterface-install-scripts/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_install.sh b/openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_install.sh
index 708da918e62d08d717998c1288f6c8518f6719f1..6cd1f7d54933d82ec07308bf037c82947d9ca8ae 100755
--- a/openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_install.sh
+++ b/openairinterface5g/openairinterface-install-scripts/flexRIC_oai_gNB_install.sh
@@ -1,27 +1,33 @@
 #!/bin/bash
 
+sudo apt-get update
+
+## Install dependencies 
+# sudo apt-get install -y autotools-dev
+sudo apt-get install -y automake 					    # Required for run 'swig/autogen.sh'
+sudo apt-get install -y g++ make libpcre2-dev byacc     # Required for swig install
+sudo apt-get install -y cmake python3-dev libsctp-dev 	# Required for flexric install
+# sudo apt-get install -y libpcre2-dev
+# sudo apt-get install -y pcre2-utils
+# 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 
+
 ## 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 -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
+## Testar com a libuhd4.4.0 ao invés de libuhd4.2.0u
 sudo apt-get install libuhd-dev uhd-host -y
-sudo apt-get install libuhd4.2.0 -y
+sudo apt-get install libuhd4.2.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
 
 # 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
@@ -31,6 +37,7 @@ cd $WORK_DIR/swig
 make
 sudo make install
 
+
 ## Install FlexRIC
 cd $WORK_DIR/
 git clone https://gitlab.eurecom.fr/mosaic5g/flexric.git
@@ -43,7 +50,6 @@ make
 sudo make install
 
 
-
 ## Install OAI UE and OAI gNB
 cd $WORK_DIR/
 git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
@@ -55,10 +61,10 @@ 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 $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
+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
+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
+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
+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
diff --git a/openairinterface5g/openairinterface-install-scripts/oai_5g_core_install.sh b/openairinterface5g/openairinterface-install-scripts/oai_5g_core_install.sh
index 4e1c6711f30c289c219875249cfd6147c254dc40..2e231b88508230088c3308e9a63d7d5fcd4f07cc 100755
--- a/openairinterface5g/openairinterface-install-scripts/oai_5g_core_install.sh
+++ b/openairinterface5g/openairinterface-install-scripts/oai_5g_core_install.sh
@@ -1,30 +1,28 @@
 #!/bin/bash
 
-##Install dependencies
-
+## Install dependencies
 sudo apt-get install ca-certificates -y
 sudo apt-get install curl -y
 sudo apt-get install gnupg -y
 sudo apt-get install lsb-release -y
 
-## Installation Wireshark
 
+## Installation Wireshark
 sudo add-apt-repository ppa:wireshark-dev/stable -y
 sudo apt update -y 
 sudo apt install wireshark -y
 
-## Clone OpenAirInterface 5G Core
 
-sudo rm -r ~/oai-cn5g-fed
-git clone https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git ~/oai-cn5g-fed
+# Work directory path is the current directory
+WORK_DIR=`pwd`
 
-## Configuration of the packer forwarding
 
+## Configuration of the packer forwarding
 sudo sysctl net.ipv4.conf.all.forwarding=1
 sudo iptables -P FORWARD ACCEPT
 
-## Install docker and docker-compose
 
+## Install docker and docker-compose
 sudo rm /etc/apt/sources.list.d/docker.list*
 sudo mkdir -p /etc/apt/keyrings -y
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
@@ -35,6 +33,7 @@ sudo apt-get install docker-ce docker-ce-cli containerd.io docker-compose-plugin
 sudo curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
 sudo chmod +x /usr/local/bin/docker-compose
 
+
 ## Pulling the images from Docker Hub
 sudo docker pull oaisoftwarealliance/oai-amf:v1.5.0
 sudo docker pull oaisoftwarealliance/oai-nrf:v1.5.0
@@ -46,7 +45,6 @@ sudo docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
 sudo docker pull oaisoftwarealliance/trf-gen-cn5g:latest
 
 ## Tag Docker Images
-
 sudo docker image tag oaisoftwarealliance/trf-gen-cn5g:latest trf-gen-cn5g:latest
 sudo docker image tag oaisoftwarealliance/oai-amf:v1.5.0 oai-amf:v1.5.0
 sudo docker image tag oaisoftwarealliance/oai-nrf:v1.5.0 oai-nrf:v1.5.0
@@ -56,33 +54,32 @@ sudo docker image tag oaisoftwarealliance/oai-udm:v1.5.0 oai-udm:v1.5.0
 sudo docker image tag oaisoftwarealliance/oai-ausf:v1.5.0 oai-ausf:v1.5.0
 sudo docker image tag oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 oai-spgwu-tiny:v1.5.0
 
-cd ~/oai-cn5g-fed
+
+## Clone OpenAirInterface 5G Core
+if [ -d "$WORK_DIR/oai-cn5g-fed" ]; then
+  sudo rm -r $WORK_DIR/oai-cn5g-fed
+fi
+git clone https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git
+cd $WORK_DIR/oai-cn5g-fed
 git checkout -f v1.5.0
 
 ## OAI CN5G Configuration files
-
-sudo wget -O ~/oai-cn5g-fed/docker-compose/docker-compose-basic-nrf.yaml https://projetos.imd.ufrn.br/reginalab/sdran-openairinterface/-/raw/main/openairinterface5g/openairinterface-conf/docker-compose-basic-nrf.yaml?inline=false
-sudo wget -O ~/oai-cn5g-fed/docker-compose/database/oai_db.sql https://gitlab.eurecom.fr/oai/openairinterface5g/-/raw/develop/doc/tutorial_resources/oai_db.sql?inline=false
-sudo chmod +x ~/oai-cn5g-fed/docker-compose/database/oai_db.sql
+wget -O $WORK_DIR/oai-cn5g-fed/docker-compose/docker-compose-basic-nrf.yaml https://projetos.imd.ufrn.br/reginalab/sdran-openairinterface/-/raw/main/openairinterface5g/openairinterface-conf/docker-compose-basic-nrf.yaml?inline=false
+wget -O $WORK_DIR/oai-cn5g-fed/docker-compose/database/oai_db.sql https://gitlab.eurecom.fr/oai/openairinterface5g/-/raw/develop/doc/tutorial_resources/oai_db.sql?inline=false
 
 ## Synchronizing the tutorials
-
 sudo ./scripts/syncComponents.sh
 git submodule deinit --all --force
 git submodule init
 git submodule update
 
 ## Creating the bridge 5GC
-
 sudo docker network create --driver=bridge --subnet=192.168.70.128/26 -o "com.docker.network.bridge.name"="demo-oai" demo-oai-public-net
 
 ## Deploy the 5GC
-
-cd ~/oai-cn5g-fed/docker-compose
+cd $WORK_DIR/oai-cn5g-fed/docker-compose
 sudo python3 core-network.py --type start-basic --scenario 1
 
 ## Docker post-installation
-
-sudo groupadd docker
-sudo usermod -aG docker $USER
-newgrp docker
+# Enabling current user to run docker commands
+sudo usermod -aG docker $USER
\ No newline at end of file