diff --git a/doc/NR_SA_CN5G_gNB_B210_COTS_UE_Tutorial.md b/doc/NR_SA_CN5G_gNB_B210_COTS_UE_Tutorial.md
deleted file mode 100644
index c5561977a1193a7735529608c5a21b97dfb9d24f..0000000000000000000000000000000000000000
--- a/doc/NR_SA_CN5G_gNB_B210_COTS_UE_Tutorial.md
+++ /dev/null
@@ -1,226 +0,0 @@
-<table style="border-collapse: collapse; border: none;">
-  <tr style="border-collapse: collapse; border: none;">
-    <td style="border-collapse: collapse; border: none;">
-      <a href="http://www.openairinterface.org/">
-         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
-         </img>
-      </a>
-    </td>
-    <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">OAI 5G SA tutorial for USRP B210</font></b>
-    </td>
-  </tr>
-</table>
-
-**TABLE OF CONTENTS**
-
-1. [Scenario](#1-scenario)
-2. [OAI CN5G](#2-oai-cn5g)
-    1. [OAI CN5G pre-requisites](#21-oai-cn5g-pre-requisites)
-    2. [OAI CN5G Setup](#22-oai-cn5g-setup)
-    3. [OAI CN5G Configuration files](#23-oai-cn5g-configuration-files)
-    4. [SIM Card](#24-sim-card)
-3. [OAI gNB](#3-oai-gnb)
-    1. [OAI gNB pre-requisites](#31-oai-gnb-pre-requisites)
-    2. [Build OAI gNB](#32-build-oai-gnb)
-4. [Run OAI CN5G and OAI gNB with USRP B210](#4-run-oai-cn5g-and-oai-gnb-with-usrp-b210)
-    1. [Run OAI CN5G](#41-run-oai-cn5g)
-    2. [Run OAI gNB](#42-run-oai-gnb)
-5. [Testing with QUECTEL RM500Q](#5-testing-with-quectel-rm500q)
-    1. [Setup QUECTEL](#51-setup-quectel)
-    2. [Ping test](#52-ping-test)
-    3. [Downlink iPerf test](#53-downlink-iperf-test)
-
-
-# 1. Scenario
-In this tutorial we describe how to configure and run a 5G end-to-end setup with OAI CN5G, OAI gNB and COTS UE.
-
-Minimum hardware requirements:
-- Laptop/Desktop/Server for OAI CN5G and OAI gNB
-    - Operating System: [Ubuntu 20.04.4 LTS](https://releases.ubuntu.com/20.04.4/ubuntu-20.04.4-desktop-amd64.iso)
-    - CPU: 8 cores x86_64 @ 3.5 GHz
-    - RAM: 32 GB
-- Laptop for UE
-    - Operating System: Microsoft Windows 10 x64
-    - CPU: 4 cores x86_64
-    - RAM: 8 GB
-    - Windows driver for Quectel MUST be equal or higher than version **2.2.4**
-- [USRP B210](https://www.ettus.com/all-products/ub210-kit/)
-- Quectel RM500Q
-    - Module, M.2 to USB adapter, antennas and SIM card
-    - Firmware version of Quectel MUST be equal or higher than **RM500QGLABR11A06M4G**
-
-
-# 2. OAI CN5G
-
-## 2.1 OAI CN5G pre-requisites
-
-```bash
-sudo apt install -y git net-tools putty
-
-sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu  $(lsb_release -cs)  stable"
-sudo apt update
-sudo apt install -y docker docker-ce
-
-# Add your username to the docker group, otherwise you will have to run in sudo mode.
-sudo usermod -a -G docker $(whoami)
-reboot
-
-# https://docs.docker.com/compose/install/
-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
-```
-
-## 2.2 OAI CN5G Setup
-
-```bash
-# Git oai-cn5g-fed repository
-git clone https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git ~/oai-cn5g-fed
-
-# Pull docker images
-docker pull oaisoftwarealliance/oai-amf:develop
-docker pull oaisoftwarealliance/oai-nrf:develop
-docker pull oaisoftwarealliance/oai-smf:develop
-docker pull oaisoftwarealliance/oai-udr:develop
-docker pull oaisoftwarealliance/oai-udm:develop
-docker pull oaisoftwarealliance/oai-ausf:develop
-docker pull oaisoftwarealliance/oai-spgwu-tiny:develop
-docker pull oaisoftwarealliance/trf-gen-cn5g:latest
-
-# Tag docker images
-docker image tag oaisoftwarealliance/oai-amf:develop oai-amf:develop
-docker image tag oaisoftwarealliance/oai-nrf:develop oai-nrf:develop
-docker image tag oaisoftwarealliance/oai-smf:develop oai-smf:develop
-docker image tag oaisoftwarealliance/oai-udr:develop oai-udr:develop
-docker image tag oaisoftwarealliance/oai-udm:develop oai-udm:develop
-docker image tag oaisoftwarealliance/oai-ausf:develop oai-ausf:develop
-docker image tag oaisoftwarealliance/oai-spgwu-tiny:develop oai-spgwu-tiny:develop
-docker image tag oaisoftwarealliance/trf-gen-cn5g:latest trf-gen-cn5g:latest
-```
-
-## 2.3 OAI CN5G Configuration files
-Download and copy configuration files:
-- Copy [docker-compose-basic-nrf.yaml](tutorial_resources/docker-compose-basic-nrf.yaml) to `~/oai-cn5g-fed/docker-compose`
-- Copy [oai_db.sql](tutorial_resources/oai_db.sql) to `~/oai-cn5g-fed/docker-compose/database`
-
-Change permissions on oai_db.sql to prevent mysql permission denied error:
-```bash
-chmod 644 ~/oai-cn5g-fed/docker-compose/database/oai_db.sql
-```
-
-## 2.4 SIM Card
-Program SIM Card with [Open Cells Project](https://open-cells.com/) application [uicc-v2.6](https://open-cells.com/d5138782a8739209ec5760865b1e53b0/uicc-v2.6.tgz).
-
-```bash
-sudo ./program_uicc --adm 12345678 --imsi 208990000000001 --isdn 00000001 --acc 0001 --key fec86ba6eb707ed08905757b1bb44b8f --opc C42449363BBAD02B66D16BC975D77CC1 -spn "OpenAirInterface" --authenticate
-```
-
-
-# 3. OAI gNB
-
-## 3.1 OAI gNB pre-requisites
-
-### Build UHD from source
-```bash
-sudo apt install -y libboost-all-dev libusb-1.0-0-dev doxygen python3-docutils python3-mako python3-numpy python3-requests python3-ruamel.yaml python3-setuptools cmake build-essential
-
-git clone https://github.com/EttusResearch/uhd.git ~/uhd
-cd ~/uhd
-git checkout v4.0.0.0
-cd host
-mkdir build
-cd build
-cmake ../
-make -j 4
-make test # This step is optional
-sudo make install
-sudo ldconfig
-sudo uhd_images_downloader
-```
-
-## 3.2 Build OAI gNB
-
-```bash
-# Get openairinterface5g source code
-git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git ~/openairinterface5g
-cd ~/openairinterface5g
-git checkout develop
-
-# Install dependencies in Ubuntu 20.04
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets
-./build_oai -I
-
-# Build OAI gNB
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets
-./build_oai -w USRP --ninja --nrUE --gNB --build-lib all -c
-```
-
-
-# 4. Run OAI CN5G and OAI gNB with USRP B210
-
-## 4.1 Run OAI CN5G
-
-```bash
-cd ~/oai-cn5g-fed/docker-compose
-python3 core-network.py --type start-basic --scenario 1
-```
-
-## 4.2 Run OAI gNB
-
-```bash
-cd ~/openairinterface5g
-source oaienv
-cd cmake_targets/ran_build/build
-sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --sa -E --continuous-tx
-```
-
-Make sure that during USRP initialization, it shows that USB 3 is used.
-
-# 5. Testing with Quectel RM500Q
-
-## 5.1 Setup Quectel
-With [PuTTY](https://the.earth.li/~sgtatham/putty/latest/w64/putty.exe), send the following AT commands to the module using a serial interface (ex: COM2) at 115200 bps:
-```bash
-# MUST be sent at least once everytime there is a firmware upgrade!
-AT+QMBNCFG="Select","ROW_Commercial"
-AT+QMBNCFG="AutoSel",0
-AT+CFUN=1,1
-AT+CGDCONT=1,"IP","oai"
-AT+CGDCONT=2
-AT+CGDCONT=3
-
-# (Optional, debug only, AT commands) Activate PDP context, retrieve IP address and test with ping
-AT+CGACT=1,1
-AT+CGPADDR=1
-AT+QPING=1,"openairinterface.org"
-```
-
-## 5.2 Ping test
-- UE host
-```bash
-ping 192.168.70.135 -t -S 12.1.1.2
-```
-- CN5G host
-```bash
-docker exec -it oai-ext-dn ping 12.1.1.2
-```
-
-## 5.3 Downlink iPerf test
-- UE host
-    - Download iPerf for Microsoft Windows from [here](https://iperf.fr/download/windows/iperf-2.0.9-win64.zip).
-    - Extract to Desktop and run with Command Prompt:
-```bash
-cd C:\Users\User\Desktop\iPerf\iperf-2.0.9-win64\iperf-2.0.9-win64
-iperf -s -u -i 1 -B 12.1.1.2
-```
-
-- CN5G host
-```bash
-docker exec -it oai-ext-dn iperf -u -t 86400 -i 1 -fk -B 192.168.70.135 -b 125M -c 12.1.1.2
-```
diff --git a/doc/NR_SA_CN5G_gNB_N300_COTS_UE_Tutorial.md b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
similarity index 84%
rename from doc/NR_SA_CN5G_gNB_N300_COTS_UE_Tutorial.md
rename to doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
index 0fbff802ade53be22338810d334f4d03118cc2e8..d5149a6c4ecef9acfc6e351fe0bd1a24ed3a8e97 100644
--- a/doc/NR_SA_CN5G_gNB_N300_COTS_UE_Tutorial.md
+++ b/doc/NR_SA_CN5G_gNB_USRP_COTS_UE_Tutorial.md
@@ -7,7 +7,7 @@
       </a>
     </td>
     <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">OAI 5G SA tutorial for USRP N300 or X300</font></b>
+      <b><font size = "5">OAI 5G SA tutorial</font></b>
     </td>
   </tr>
 </table>
@@ -24,9 +24,12 @@
     1. [OAI gNB pre-requisites](#31-oai-gnb-pre-requisites)
     2. [Build OAI gNB](#32-build-oai-gnb)
     3. [N300 Ethernet Tuning](#33-n300-ethernet-tuning)
-4. [Run OAI CN5G and OAI gNB with USRP N300](#4-run-oai-cn5g-and-oai-gnb-with-usrp-n300)
+4. [Run OAI CN5G and OAI gNB](#4-run-oai-cn5g-and-oai-gnb)
     1. [Run OAI CN5G](#41-run-oai-cn5g)
     2. [Run OAI gNB](#42-run-oai-gnb)
+       1. [USRP B210](#usrp-b210)
+       2. [USRP N300](#usrp-n300)
+       3. [USRP X300](#usrp-x300)
 5. [Testing with QUECTEL RM500Q](#5-testing-with-quectel-rm500q)
     1. [Setup QUECTEL](#51-setup-quectel)
     2. [Ping test](#52-ping-test)
@@ -46,7 +49,8 @@ Minimum hardware requirements:
     - CPU: 4 cores x86_64
     - RAM: 8 GB
     - Windows driver for Quectel MUST be equal or higher than version **2.2.4**
-- [USRP N300](https://www.ettus.com/all-products/USRP-N300/) or [USRP X300](https://www.ettus.com/all-products/x300-kit/): Please identify the network interface(s) on which the USRP is connected.
+- [USRP B210](https://www.ettus.com/all-products/ub210-kit/), [USRP N300](https://www.ettus.com/all-products/USRP-N300/) or [USRP X300](https://www.ettus.com/all-products/x300-kit/)
+    - Please identify the network interface(s) on which the USRP is connected and update the gNB configuration file
 - Quectel RM500Q
     - Module, M.2 to USB adapter, antennas and SIM card
     - Firmware version of Quectel MUST be equal or higher than **RM500QGLABR11A06M4G**
@@ -162,25 +166,29 @@ cd cmake_targets
 ./build_oai -w USRP --ninja --nrUE --gNB --build-lib all -c
 ```
 
-## 3.3 N300 Ethernet Tuning
+## 3.3 USRP N300 and X300 Ethernet Tuning
 
 Please also refer to the official [USRP Host Performance Tuning Tips and Tricks](https://kb.ettus.com/USRP_Host_Performance_Tuning_Tips_and_Tricks) tuning guide.
 
 The following steps are recommended. Please change the network interface(s) as required. Also, you should have 10Gbps interface(s): if you use two cables, you should have the XG interface. Refer to the [N300 Getting Started Guide](https://kb.ettus.com/USRP_N300/N310/N320/N321_Getting_Started_Guide) for more information.
 
 * Use an MTU of 9000: how to change this depends on the network management tool. In the case of Network Manager, this can be done from the GUI.
-* Increase the kernel socket buffer (also done by the USRP driver in OAI):
-  ```
-  sysctl -w net.core.rmem_max=8388608
-  sysctl -w net.core.wmem_max=8388608
-  sysctl -w net.core.rmem_default=65536
-  sysctl -w net.core.wmem_default=65536
-  ```
+* Increase the kernel socket buffer (also done by the USRP driver in OAI)
 * Increase Ethernet Ring Buffers: `sudo ethtool -G <ifname> rx 4096 tx 4096`
-* Disable hyper-threading in the BIOS
-* Disable KPTI Protections for Spectre/Meltdown for more performance. **This is a security risk.** Add `mitigations=off nosmt` in your grub config and update grub.
+* Disable hyper-threading in the BIOS (This step is optional)
+* Optional: Disable KPTI Protections for Spectre/Meltdown for more performance. **This is a security risk.** Add `mitigations=off nosmt` in your grub config and update grub. (This step is optional)
 
-# 4. Run OAI CN5G and OAI gNB with USRP N300
+Example code to run:
+```
+for ((i=0;i<$(nproc);i++)); do sudo cpufreq-set -c $i -r -g performance; done
+sudo sysctl -w net.core.wmem_max=62500000
+sudo sysctl -w net.core.rmem_max=62500000
+sudo sysctl -w net.core.wmem_default=62500000
+sudo sysctl -w net.core.rmem_default=62500000
+sudo ethtool -G enp1s0f0 tx 4096 rx 4096
+```
+
+# 4. Run OAI CN5G and OAI gNB
 
 ## 4.1 Run OAI CN5G
 
@@ -191,21 +199,29 @@ python3 core-network.py --type start-basic --scenario 1
 
 ## 4.2 Run OAI gNB
 
+### USRP B210
+```bash
+cd ~/openairinterface5g
+source oaienv
+cd cmake_targets/ran_build/build
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --sa -E --continuous-tx
+```
+### USRP N300
 ```bash
-# USRP N300
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf --sa --usrp-tx-thread-config 1
+```
 
-# USRP X300
+### USRP X300
+```bash
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf --sa --usrp-tx-thread-config 1 -E --continuous-tx
 ```
 
-
 # 5. Testing with Quectel RM500Q
 
 ## 5.1 Setup Quectel
@@ -246,5 +262,5 @@ iperf -s -u -i 1 -B 12.1.1.2
 
 - CN5G host
 ```bash
-docker exec -it oai-ext-dn iperf -u -t 86400 -i 1 -fk -B 192.168.70.135 -b 640M -c 12.1.1.2
+docker exec -it oai-ext-dn iperf -u -t 86400 -i 1 -fk -B 192.168.70.135 -b 100M -c 12.1.1.2
 ```